From 07a8ac577846afb67aec6d8091387db724bfb9e4 Mon Sep 17 00:00:00 2001 From: Ali Maredia Date: Thu, 9 Jan 2020 15:16:47 -0500 Subject: [PATCH] qa: s3tests/s3tests-website tasks no longer only use ubunutu Signed-off-by: Ali Maredia --- 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/centos_latest.yaml | 1 + qa/suites/rgw/verify/tasks/0-install.yaml | 4 +--- qa/suites/rgw/verify/tasks/s3tests-java.yaml | 2 -- qa/suites/rgw/verify/tasks/s3tests.yaml | 2 -- qa/suites/rgw/website/centos_latest.yaml | 1 + qa/suites/rgw/website/overrides.yaml | 4 +--- 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 -- 15 files changed, 4 insertions(+), 28 deletions(-) create mode 120000 qa/suites/rgw/verify/centos_latest.yaml create mode 120000 qa/suites/rgw/website/centos_latest.yaml diff --git a/qa/suites/rgw/crypt/4-tests/s3tests.yaml b/qa/suites/rgw/crypt/4-tests/s3tests.yaml index ac9199a8db1..9f52fee08e0 100644 --- 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 7c1cd3233d5..4cdded04e76 100644 --- 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 76df283db5f..e691920f744 100644 --- 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 index 00000000000..bd9854e7029 --- /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 f1955a384f5..5ebe67269f3 100644 --- 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 9b1fc564c1b..06c134c3754 100644 --- 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 18bf59c5eee..b5aef9b044b 100644 --- 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 index 00000000000..bd9854e7029 --- /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 aca286c1141..f433654f61f 100644 --- 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 5baef904d31..9ca6fcfbdb0 100644 --- 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 502a9925aa4..29a6cec129c 100644 --- 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 63163e5c225..2ba6a4b497e 100644 --- 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 615b490ea28..7d39cfbe920 100644 --- 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 cbb5f8125b4..d76121fad10 100644 --- 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 c14e5a40cd0..8228501ca4b 100644 --- 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: -- 2.47.3