diff options
| author | Mathew Robinson <chasinglogic@gmail.com> | 2018-08-13 17:06:43 -0400 |
|---|---|---|
| committer | Mathew Robinson <chasinglogic@gmail.com> | 2019-04-02 11:40:08 -0400 |
| commit | 33029111d6de554faf69502c867958e287c90a94 (patch) | |
| tree | 2cbcb792fa847d8b866bc47230bb445f686ea4cc | |
| parent | 2a883742c212c5ef27bd4cf69cea0a819a6f461b (diff) | |
| download | mongo-33029111d6de554faf69502c867958e287c90a94.tar.gz | |
SERVER-36622 Allow newer versions of RHEL and Ubuntu to succeed for install_compass
(cherry picked from commit 866e0531147b023344709653acbf556d5b631d09)
| -rw-r--r-- | buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb | 7 |
1 files changed, 3 insertions, 4 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 739cc951064..f927a58fe94 100644 --- a/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb +++ b/buildscripts/package_test/test/recipes/service/install_mongodb_spec.rb @@ -55,10 +55,9 @@ else end 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 |