From e183e7af5498d55edfdbd27afa0fb410047fbeb9 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Fri, 29 Jan 2021 12:13:45 -0500 Subject: [PATCH] qa: rgw tests target ceph-pacific branches instead of ceph-master s3test and ragweed tests now use ceph-pacific branch. this commit diverges from master, so is applied directly to the pacific branch Signed-off-by: Casey Bodley --- qa/suites/rgw/crypt/4-tests/s3tests.yaml | 2 +- qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml | 4 ++-- qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml | 2 +- qa/suites/rgw/sts/tasks/ststests.yaml | 2 +- qa/suites/rgw/sts/tasks/webidentity.yaml | 2 +- qa/suites/rgw/thrash/workload/rgw_s3tests.yaml | 2 +- qa/suites/rgw/verify/tasks/ragweed.yaml | 2 +- qa/suites/rgw/verify/tasks/s3tests.yaml | 2 +- qa/suites/rgw/website/tasks/s3tests-website.yaml | 2 +- qa/suites/smoke/basic/tasks/test/rgw_ec_s3tests.yaml | 2 +- qa/suites/smoke/basic/tasks/test/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 +- .../nautilus-x/parallel/2-workload/rgw_ragweed_prepare.yaml | 2 +- .../parallel/5-final-workload/rgw_ragweed_check.yaml | 2 +- .../5-final-workload/rgw_ragweed_check.yaml | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qa/suites/rgw/crypt/4-tests/s3tests.yaml b/qa/suites/rgw/crypt/4-tests/s3tests.yaml index 9f52fee08e001..32fde0fce7c28 100644 --- a/qa/suites/rgw/crypt/4-tests/s3tests.yaml +++ b/qa/suites/rgw/crypt/4-tests/s3tests.yaml @@ -1,7 +1,7 @@ tasks: - s3tests: client.0: - force-branch: ceph-master + force-branch: ceph-pacific barbican: kms_key: my-key-1 kms_key2: my-key-2 diff --git a/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml b/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml index a6ecc649a13bd..d6d11b7922837 100644 --- a/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml +++ b/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml @@ -4,12 +4,12 @@ tasks: - rgw: [client.0] - ragweed: client.0: - default-branch: ceph-master + default-branch: ceph-pacific rgw_server: client.0 stages: prepare - ragweed: client.0: - default-branch: ceph-master + default-branch: ceph-pacific rgw_server: client.0 stages: check overrides: diff --git a/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml b/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml index 4cdded04e768a..4153c70dde6b4 100644 --- a/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml +++ b/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml @@ -4,7 +4,7 @@ tasks: - rgw: [client.0] - s3tests: client.0: - force-branch: ceph-master + force-branch: ceph-pacific rgw_server: client.0 overrides: ceph: diff --git a/qa/suites/rgw/sts/tasks/ststests.yaml b/qa/suites/rgw/sts/tasks/ststests.yaml index 10c2f2aed780a..a154e5dd097ea 100644 --- a/qa/suites/rgw/sts/tasks/ststests.yaml +++ b/qa/suites/rgw/sts/tasks/ststests.yaml @@ -3,7 +3,7 @@ tasks: client.0: sts_tests: True extra_attrs: ["test_of_sts"] - force-branch: ceph-master + force-branch: ceph-pacific rgw_server: client.0 overrides: ceph: diff --git a/qa/suites/rgw/sts/tasks/webidentity.yaml b/qa/suites/rgw/sts/tasks/webidentity.yaml index 61427f359a5ee..8892f7082284b 100644 --- a/qa/suites/rgw/sts/tasks/webidentity.yaml +++ b/qa/suites/rgw/sts/tasks/webidentity.yaml @@ -6,7 +6,7 @@ tasks: - s3tests: client.0: sts_tests: True - force-branch: ceph-master + force-branch: ceph-pacific rgw_server: client.0 extra_attrs: ['webidentity_test'] overrides: diff --git a/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml b/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml index e691920f744a0..81409865434c0 100644 --- a/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml +++ b/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml @@ -1,7 +1,7 @@ tasks: - s3tests: client.0: - force-branch: ceph-master + force-branch: ceph-pacific rgw_server: client.0 overrides: ceph: diff --git a/qa/suites/rgw/verify/tasks/ragweed.yaml b/qa/suites/rgw/verify/tasks/ragweed.yaml index 8fbd3cefb928d..a84f4f14d9996 100644 --- a/qa/suites/rgw/verify/tasks/ragweed.yaml +++ b/qa/suites/rgw/verify/tasks/ragweed.yaml @@ -1,6 +1,6 @@ tasks: - ragweed: client.0: - default-branch: ceph-master + default-branch: ceph-pacific rgw_server: client.0 stages: prepare,check diff --git a/qa/suites/rgw/verify/tasks/s3tests.yaml b/qa/suites/rgw/verify/tasks/s3tests.yaml index b5aef9b044b83..4cb6b62361906 100644 --- a/qa/suites/rgw/verify/tasks/s3tests.yaml +++ b/qa/suites/rgw/verify/tasks/s3tests.yaml @@ -1,5 +1,5 @@ tasks: - s3tests: client.0: - force-branch: ceph-master + force-branch: ceph-pacific rgw_server: client.0 diff --git a/qa/suites/rgw/website/tasks/s3tests-website.yaml b/qa/suites/rgw/website/tasks/s3tests-website.yaml index 9ca6fcfbdb06a..02128433eab5b 100644 --- a/qa/suites/rgw/website/tasks/s3tests-website.yaml +++ b/qa/suites/rgw/website/tasks/s3tests-website.yaml @@ -12,6 +12,6 @@ tasks: dns-s3website-name: s3-website. - s3tests: client.0: - force-branch: ceph-master + force-branch: ceph-pacific rgw_server: client.0 rgw_website_server: client.1 diff --git a/qa/suites/smoke/basic/tasks/test/rgw_ec_s3tests.yaml b/qa/suites/smoke/basic/tasks/test/rgw_ec_s3tests.yaml index 8d1c9fc72a312..990b6408722a5 100644 --- a/qa/suites/smoke/basic/tasks/test/rgw_ec_s3tests.yaml +++ b/qa/suites/smoke/basic/tasks/test/rgw_ec_s3tests.yaml @@ -8,7 +8,7 @@ tasks: - rgw: [client.0] - s3tests: client.0: - force-branch: ceph-master + force-branch: ceph-pacific rgw_server: client.0 overrides: ceph: diff --git a/qa/suites/smoke/basic/tasks/test/rgw_s3tests.yaml b/qa/suites/smoke/basic/tasks/test/rgw_s3tests.yaml index 189a2d57363b3..3a1d6486d0e62 100644 --- a/qa/suites/smoke/basic/tasks/test/rgw_s3tests.yaml +++ b/qa/suites/smoke/basic/tasks/test/rgw_s3tests.yaml @@ -4,7 +4,7 @@ tasks: - rgw: [client.0] - s3tests: client.0: - force-branch: ceph-master + force-branch: ceph-pacific rgw_server: client.0 overrides: ceph: diff --git a/qa/suites/teuthology/rgw/tasks/s3tests-civetweb.yaml b/qa/suites/teuthology/rgw/tasks/s3tests-civetweb.yaml index 7d39cfbe9202a..cd3e8cf3d7662 100644 --- a/qa/suites/teuthology/rgw/tasks/s3tests-civetweb.yaml +++ b/qa/suites/teuthology/rgw/tasks/s3tests-civetweb.yaml @@ -11,7 +11,7 @@ tasks: - s3tests: client.0: rgw_server: client.0 - force-branch: ceph-master + force-branch: ceph-pacific overrides: ceph: fs: xfs diff --git a/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml b/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml index d76121fad1029..e6ba864ca1e9b 100644 --- a/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml +++ b/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml @@ -11,7 +11,7 @@ tasks: - s3tests: client.0: rgw_server: client.0 - force-branch: ceph-master + force-branch: ceph-pacific overrides: ceph: fs: xfs diff --git a/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml b/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml index 8228501ca4b7b..68a531bb3d7f3 100644 --- a/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml +++ b/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml @@ -12,7 +12,7 @@ tasks: - s3tests: client.0: rgw_server: client.0 - force-branch: ceph-master + force-branch: ceph-pacific overrides: ceph: fs: xfs diff --git a/qa/suites/upgrade/nautilus-x/parallel/2-workload/rgw_ragweed_prepare.yaml b/qa/suites/upgrade/nautilus-x/parallel/2-workload/rgw_ragweed_prepare.yaml index 7c8dd21a2a125..5dbffc73d49e5 100644 --- a/qa/suites/upgrade/nautilus-x/parallel/2-workload/rgw_ragweed_prepare.yaml +++ b/qa/suites/upgrade/nautilus-x/parallel/2-workload/rgw_ragweed_prepare.yaml @@ -6,7 +6,7 @@ workload: - sequential: - ragweed: client.1: - default-branch: ceph-master + default-branch: ceph-pacific rgw_server: client.1 stages: prepare - print: "**** done rgw ragweed prepare 2-workload" diff --git a/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw_ragweed_check.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw_ragweed_check.yaml index 7f31cacca6857..2e94f25038e00 100644 --- a/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw_ragweed_check.yaml +++ b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw_ragweed_check.yaml @@ -5,7 +5,7 @@ rgw-final-workload: full_sequential: - ragweed: client.1: - default-branch: ceph-master + default-branch: ceph-pacific rgw_server: client.1 stages: check - print: "**** done ragweed check 4-final-workload" diff --git a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/5-final-workload/rgw_ragweed_check.yaml b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/5-final-workload/rgw_ragweed_check.yaml index 7f31cacca6857..2e94f25038e00 100644 --- a/qa/suites/upgrade/octopus-x/parallel-no-cephadm/5-final-workload/rgw_ragweed_check.yaml +++ b/qa/suites/upgrade/octopus-x/parallel-no-cephadm/5-final-workload/rgw_ragweed_check.yaml @@ -5,7 +5,7 @@ rgw-final-workload: full_sequential: - ragweed: client.1: - default-branch: ceph-master + default-branch: ceph-pacific rgw_server: client.1 stages: check - print: "**** done ragweed check 4-final-workload" -- 2.39.5