From a783f01eec20d0f0c1c38ebe02b8b211992d3405 Mon Sep 17 00:00:00 2001 From: Keith Schincke Date: Tue, 31 May 2016 15:42:45 -0400 Subject: [PATCH] Disable Apache/RGW for Ubuntu testing until after bumping Ceph version to Jewel. CI tests need to run while upgrading this test to Jewel. Change-Id: I57a947a6469738744067741df277c04892a310d9 --- spec/acceptance/ceph_rgw_spec.rb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/spec/acceptance/ceph_rgw_spec.rb b/spec/acceptance/ceph_rgw_spec.rb index 7decbafe..efa0a271 100644 --- a/spec/acceptance/ceph_rgw_spec.rb +++ b/spec/acceptance/ceph_rgw_spec.rb @@ -160,6 +160,7 @@ describe 'ceph rgw' do EOS osfamily = fact 'osfamily' + operatingsystem = fact 'operatingsystem' servicequery = { 'Debian' => 'status radosgw id=radosgw.gateway', @@ -167,7 +168,8 @@ describe 'ceph rgw' do } # RGW on CentOS is currently broken, so lets disable tests for now. - if osfamily != 'RedHat' + # RGW testing disabled on Ubuntu while bumping Jewel + if osfamily != 'RedHat' and operatingsystem != 'Ubuntu' apply_manifest(pp, :catch_failures => true) # Enable as soon as remaining changes are fixed #apply_manifest(pp, :catch_changes => true) @@ -301,6 +303,7 @@ describe 'ceph rgw' do EOS osfamily = fact 'osfamily' + operatingsystem = fact 'operatingsystem' servicequery = { 'Debian' => 'status radosgw id=radosgw.gateway', @@ -308,7 +311,8 @@ describe 'ceph rgw' do } # RGW on CentOS is currently broken, so lets disable tests for now. - if osfamily != 'RedHat' + # RGW testing disabled on Ubuntu while bumping Jewel + if osfamily != 'RedHat' and operatingsystem != 'Ubuntu' apply_manifest(pp, :catch_failures => true) # Enable as soon as remaining changes are fixed #apply_manifest(pp, :catch_changes => true) @@ -501,6 +505,7 @@ describe 'ceph rgw' do EOS osfamily = fact 'osfamily' + operatingsystem = fact 'operatingsystem' servicequery = { 'Debian' => 'status radosgw id=radosgw.gateway', @@ -508,7 +513,8 @@ describe 'ceph rgw' do } # RGW on CentOS is currently broken, so lets disable tests for now. - if osfamily != 'RedHat' + # RGW on Ubuntu is disabled until Jewel. + if osfamily != 'RedHat' and operatingsystem != 'Ubuntu' apply_manifest(pp, :catch_failures => true) # Enable as soon as remaining changes are fixed #apply_manifest(pp, :catch_changes => true) @@ -637,6 +643,7 @@ describe 'ceph rgw' do EOS osfamily = fact 'osfamily' + operatingsystem = fact 'operatingsystem' servicequery = { 'Debian' => 'status radosgw id=radosgw.gateway', @@ -644,7 +651,8 @@ describe 'ceph rgw' do } # RGW on CentOS is currently broken, so lets disable tests for now. - if osfamily != 'RedHat' + # RGW on Ubuntu is disabled until Jewel. + if osfamily != 'RedHat' and operatingsystem != 'Ubuntu' apply_manifest(pp, :catch_failures => true) # Enable as soon as remaining changes are fixed #apply_manifest(pp, :catch_changes => true)