From 5b4e9de5fd3fb3531a41542f973de6155d13d73d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 16 Dec 2019 11:37:10 -0600 Subject: [PATCH] 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 --- qa/suites/rgw/crypt/4-tests/s3tests.yaml | 2 ++ qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml | 2 ++ qa/suites/rgw/thrash/workload/rgw_s3tests.yaml | 2 ++ qa/suites/rgw/verify/tasks/s3tests-java.yaml | 2 ++ qa/suites/rgw/verify/tasks/s3tests.yaml | 2 ++ qa/suites/rgw/website/tasks/s3tests-website.yaml | 2 ++ qa/suites/smoke/basic/tasks/rgw_ec_s3tests.yaml | 2 ++ qa/suites/smoke/basic/tasks/rgw_s3tests.yaml | 2 ++ qa/suites/teuthology/rgw/tasks/s3tests-civetweb.yaml | 2 ++ qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml | 2 ++ qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml | 2 ++ 11 files changed, 22 insertions(+) diff --git a/qa/suites/rgw/crypt/4-tests/s3tests.yaml b/qa/suites/rgw/crypt/4-tests/s3tests.yaml index 9f52fee08e0..ac9199a8db1 100644 --- 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 4cdded04e76..7c1cd3233d5 100644 --- 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 e691920f744..76df283db5f 100644 --- 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 06c134c3754..9b1fc564c1b 100644 --- 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 b5aef9b044b..18bf59c5eee 100644 --- 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 9ca6fcfbdb0..5baef904d31 100644 --- 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 29a6cec129c..502a9925aa4 100644 --- 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 2ba6a4b497e..63163e5c225 100644 --- 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 7d39cfbe920..615b490ea28 100644 --- 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 d76121fad10..cbb5f8125b4 100644 --- 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 8228501ca4b..c14e5a40cd0 100644 --- 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: -- 2.39.5