qa/suites: run s3tests on ubuntu

Note that this does not capture the rgw/website test on valgrind, since
valgrind is centos only.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/suites/rgw/crypt/4-tests/s3tests.yaml b/qa/suites/rgw/crypt/4-tests/s3tests.yaml
index 9f52fee08e00159ed5115ce2e9ad0cae205e8c4f..ac9199a8db1c044a798b6f50e3081dc7ace81bc9 100644 (file)
--- a/qa/suites/rgw/crypt/4-tests/s3tests.yaml
+++ b/qa/suites/rgw/crypt/4-tests/s3tests.yaml
@@ -1,3 +1,5 @@
+# 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 4cdded04e768a166f187af236bfba07225bbf73b..7c1cd3233d5912e25a02632a04c589651977c4a2 100644 (file)
--- a/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml
+++ b/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml
@@ -1,3 +1,5 @@
+# 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 e691920f744a097c4224cc712ef17ab475640543..76df283db5f51cc83537c9e8f76978c44cfa52e3 100644 (file)
--- a/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml
+++ b/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml
@@ -1,3 +1,5 @@
+# for now, s3-tests requires py2
+os_type: ubuntu
 tasks:
 - s3tests:
     client.0:

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

diff --git a/qa/suites/rgw/website/tasks/s3tests-website.yaml b/qa/suites/rgw/website/tasks/s3tests-website.yaml
index 9ca6fcfbdb06a22eaf3e2e1b8922e99ffb110296..5baef904d31c135b05d8828912001277603b10d1 100644 (file)
--- a/qa/suites/rgw/website/tasks/s3tests-website.yaml
+++ b/qa/suites/rgw/website/tasks/s3tests-website.yaml
@@ -1,3 +1,5 @@
+# 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 29a6cec129c0cde00ebfe402adc2a20e8d572059..502a9925aa404ad3255473dae5dd24dacb6f47c0 100644 (file)
--- a/qa/suites/smoke/basic/tasks/rgw_ec_s3tests.yaml
+++ b/qa/suites/smoke/basic/tasks/rgw_ec_s3tests.yaml
@@ -1,3 +1,5 @@
+# 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 2ba6a4b497e04ae235ed6fb0cb88e65848146839..63163e5c2253f8213d2f74ca1ffd472aa4471bd0 100644 (file)
--- a/qa/suites/smoke/basic/tasks/rgw_s3tests.yaml
+++ b/qa/suites/smoke/basic/tasks/rgw_s3tests.yaml
@@ -1,3 +1,5 @@
+# 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 7d39cfbe9202a3a5c70dcd583b50f3687e38b444..615b490ea28392482a1bd198fb510a51e4de8d30 100644 (file)
--- a/qa/suites/teuthology/rgw/tasks/s3tests-civetweb.yaml
+++ b/qa/suites/teuthology/rgw/tasks/s3tests-civetweb.yaml
@@ -1,3 +1,5 @@
+# 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 d76121fad1029c864b21329a4cb2e96e828e965a..cbb5f8125b481e84e1d511287ebe36142be746e5 100644 (file)
--- a/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml
+++ b/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml
@@ -1,3 +1,5 @@
+# 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 8228501ca4b7b0036741156b29c682332e78d414..c14e5a40cd06dc40970df091963c2d41e878d8d2 100644 (file)
--- a/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml
+++ b/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml
@@ -1,3 +1,5 @@
+# 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: