openstack/puppet-ceph
Code Issues Proposed changes

Disable Apache/RGW for Ubuntu testing until after bumping Ceph version to Jewel.

Browse Source 
CI tests need to run while upgrading this test to Jewel.

Change-Id: I57a947a6469738744067741df277c04892a310d9
This commit is contained in:
Keith Schincke
2016-05-31 15:42:45 -04:00
committed by Emilien Macchi
parent 45d47273ec
commit a783f01eec
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spec/acceptance/ceph_rgw_spec.rb
View File

@@ -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)