qa: s3tests/s3tests-website tasks no longer only use ubunutu

Signed-off-by: Ali Maredia <amaredia@redhat.com>

diff --git a/qa/suites/rgw/crypt/4-tests/s3tests.yaml b/qa/suites/rgw/crypt/4-tests/s3tests.yaml
index ac9199a8db1c044a798b6f50e3081dc7ace81bc9..9f52fee08e00159ed5115ce2e9ad0cae205e8c4f 100644 (file)
--- a/qa/suites/rgw/crypt/4-tests/s3tests.yaml
+++ b/qa/suites/rgw/crypt/4-tests/s3tests.yaml
@@ -1,5 +1,3 @@
-# for now, s3-tests requires py2
-os_type: ubuntu
 tasks:
 - s3tests:
     client.0:

diff --git a/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml b/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml
index 7c1cd3233d5912e25a02632a04c589651977c4a2..4cdded04e768a166f187af236bfba07225bbf73b 100644 (file)
--- a/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml
+++ b/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml
@@ -1,5 +1,3 @@
-# for now, s3-tests requires py2
-os_type: ubuntu
 tasks:
 - install:
 - ceph:

diff --git a/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml b/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml
index 76df283db5f51cc83537c9e8f76978c44cfa52e3..e691920f744a097c4224cc712ef17ab475640543 100644 (file)
--- a/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml
+++ b/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml
@@ -1,5 +1,3 @@
-# for now, s3-tests requires py2
-os_type: ubuntu
 tasks:
 - s3tests:
     client.0:

diff --git a/qa/suites/rgw/verify/centos_latest.yaml b/qa/suites/rgw/verify/centos_latest.yaml
new file mode 120000 (symlink)
index 0000000..bd9854e
--- /dev/null
+++ b/qa/suites/rgw/verify/centos_latest.yaml
@@ -0,0 +1 @@
+.qa/distros/supported/centos_latest.yaml
\ No newline at end of file

diff --git a/qa/suites/rgw/verify/tasks/0-install.yaml b/qa/suites/rgw/verify/tasks/0-install.yaml
index f1955a384f50e3857ca416e884e1c4b8ec3c84e3..5ebe67269f3f4ddf74a371b3e29ca33a9ad02e2f 100644 (file)
--- a/qa/suites/rgw/verify/tasks/0-install.yaml
+++ b/qa/suites/rgw/verify/tasks/0-install.yaml
@@ -1,7 +1,5 @@
 # see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
-#os_type: centos
-# ubuntu and no valgrind until we migrate test to py3
-os_type: ubuntu
+os_type: centos
 
 tasks:
 - install:

diff --git a/qa/suites/rgw/verify/tasks/s3tests-java.yaml b/qa/suites/rgw/verify/tasks/s3tests-java.yaml
index 9b1fc564c1b465cf10ff21328a9f753c4ef034a3..06c134c37544fa211873a10027a1fdfd448d9fc0 100644 (file)
--- a/qa/suites/rgw/verify/tasks/s3tests-java.yaml
+++ b/qa/suites/rgw/verify/tasks/s3tests-java.yaml
@@ -1,5 +1,3 @@
-# for now, s3-tests requires py2
-os_type: ubuntu
 tasks:
 - s3tests-java:
     client.0:

diff --git a/qa/suites/rgw/verify/tasks/s3tests.yaml b/qa/suites/rgw/verify/tasks/s3tests.yaml
index 18bf59c5eee16a4fd0f31838d180c6992eba765a..b5aef9b044b83cdb9b28cd40f31b989167d0d069 100644 (file)
--- a/qa/suites/rgw/verify/tasks/s3tests.yaml
+++ b/qa/suites/rgw/verify/tasks/s3tests.yaml
@@ -1,5 +1,3 @@
-# for now, s3-tests requires py2
-os_type: ubuntu
 tasks:
 - s3tests:
     client.0:

diff --git a/qa/suites/rgw/website/centos_latest.yaml b/qa/suites/rgw/website/centos_latest.yaml
new file mode 120000 (symlink)
index 0000000..bd9854e
--- /dev/null
+++ b/qa/suites/rgw/website/centos_latest.yaml
@@ -0,0 +1 @@
+.qa/distros/supported/centos_latest.yaml
\ No newline at end of file

diff --git a/qa/suites/rgw/website/overrides.yaml b/qa/suites/rgw/website/overrides.yaml
index aca286c1141bb6f6bfdb83cb51d9bc5c6c82751b..f433654f61f396402f6f3127d062e09274cd5089 100644 (file)
--- a/qa/suites/rgw/website/overrides.yaml
+++ b/qa/suites/rgw/website/overrides.yaml
@@ -1,7 +1,5 @@
 # see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126
-#os_type: centos
-# ubuntu and no valgrind until we migrate test to py3
-os_type: ubuntu
+os_type: centos
 
 overrides:
   install:

diff --git a/qa/suites/rgw/website/tasks/s3tests-website.yaml b/qa/suites/rgw/website/tasks/s3tests-website.yaml
index 5baef904d31c135b05d8828912001277603b10d1..9ca6fcfbdb06a22eaf3e2e1b8922e99ffb110296 100644 (file)
--- a/qa/suites/rgw/website/tasks/s3tests-website.yaml
+++ b/qa/suites/rgw/website/tasks/s3tests-website.yaml
@@ -1,5 +1,3 @@
-# for now, s3-tests requires py2
-os_type: ubuntu
 tasks:
 - install:
 - ceph:

diff --git a/qa/suites/smoke/basic/tasks/rgw_ec_s3tests.yaml b/qa/suites/smoke/basic/tasks/rgw_ec_s3tests.yaml
index 502a9925aa404ad3255473dae5dd24dacb6f47c0..29a6cec129c0cde00ebfe402adc2a20e8d572059 100644 (file)
--- a/qa/suites/smoke/basic/tasks/rgw_ec_s3tests.yaml
+++ b/qa/suites/smoke/basic/tasks/rgw_ec_s3tests.yaml
@@ -1,5 +1,3 @@
-# for now, s3-tests requires py2
-os_type: ubuntu
 overrides:
    rgw:
     ec-data-pool: true

diff --git a/qa/suites/smoke/basic/tasks/rgw_s3tests.yaml b/qa/suites/smoke/basic/tasks/rgw_s3tests.yaml
index 63163e5c2253f8213d2f74ca1ffd472aa4471bd0..2ba6a4b497e04ae235ed6fb0cb88e65848146839 100644 (file)
--- a/qa/suites/smoke/basic/tasks/rgw_s3tests.yaml
+++ b/qa/suites/smoke/basic/tasks/rgw_s3tests.yaml
@@ -1,5 +1,3 @@
-# for now, s3-tests requires py2
-os_type: ubuntu
 tasks:
 - install:
 - ceph:

diff --git a/qa/suites/teuthology/rgw/tasks/s3tests-civetweb.yaml b/qa/suites/teuthology/rgw/tasks/s3tests-civetweb.yaml
index 615b490ea28392482a1bd198fb510a51e4de8d30..7d39cfbe9202a3a5c70dcd583b50f3687e38b444 100644 (file)
--- a/qa/suites/teuthology/rgw/tasks/s3tests-civetweb.yaml
+++ b/qa/suites/teuthology/rgw/tasks/s3tests-civetweb.yaml
@@ -1,5 +1,3 @@
-# for now, s3-tests requires py2
-os_type: ubuntu
 # this runs s3tests against rgw, using civetweb
 roles:
 - [mon.a, mon.c, osd.0, osd.1, osd.2, client.0]

diff --git a/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml b/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml
index cbb5f8125b481e84e1d511287ebe36142be746e5..d76121fad1029c864b21329a4cb2e96e828e965a 100644 (file)
--- a/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml
+++ b/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml
@@ -1,5 +1,3 @@
-# for now, s3-tests requires py2
-os_type: ubuntu
 # this runs s3tests against rgw, using mod_fastcgi
 roles:
 - [mon.a, mon.c, osd.0, osd.1, osd.2, client.0]

diff --git a/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml b/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml
index c14e5a40cd06dc40970df091963c2d41e878d8d2..8228501ca4b7b0036741156b29c682332e78d414 100644 (file)
--- a/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml
+++ b/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml
@@ -1,5 +1,3 @@
-# for now, s3-tests requires py2
-os_type: ubuntu
 # this runs s3tests against rgw, using mod_proxy_fcgi
 # the choice between uds or tcp with mod_proxy_fcgi depends on the distro
 roles: