diff options
| author | Mathew Robinson <chasinglogic@gmail.com> | 2018-08-13 17:06:43 -0400 |
|---|---|---|
| committer | Mathew Robinson <chasinglogic@gmail.com> | 2019-03-18 12:37:36 -0400 |
| commit | 2f9c6b9a80c8d86cdc68be3a421e44b45dfd03d0 (patch) | |
| tree | e8b40c7bd154deeac3137df870a80fd426b48742 /buildscripts | |
| parent | aa196f6b8119c5404b6df2c194a3d92646ab068e (diff) | |
| download | mongo-2f9c6b9a80c8d86cdc68be3a421e44b45dfd03d0.tar.gz | |
SERVER-36622 Allow newer versions of RHEL and Ubuntu to succeed for install_compass
(cherry picked from commit 866e0531147b023344709653acbf556d5b631d09)
Diffstat (limited to 'buildscripts')
| -rw-r--r-- | buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb b/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb index 8d78d714bcb..9788647bdfb 100644 --- a/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb +++ b/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb @@ -35,11 +35,9 @@ describe service('mongod') do it { should be_running } end - -if os[:arch] == 'x86_64' and - (os[:name] == 'ubuntu' and - (os[:release][0...5] == '14.04' or os[:release][0...5] == '16.04')) or - (os[:family] == 'redhat' and os[:release][0] == '7') +if os[:arch] == 'x86_64' and os[:name] != 'amazon' and + ((os[:name] == 'ubuntu' and os[:release].split('.')[0].to_i > 12) or + (os[:family] == 'redhat' and os[:release].split('.')[0].to_i >= 7)) describe command("install_compass") do its('exit_status') { should eq 0 } end |