From 7c6e0a1443fb48e140975093ad008cd2cf5e15ea Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Fri, 26 Jun 2020 16:03:34 -0400 Subject: [PATCH] octopus: qa/rgw: run external tests against ceph-octopus 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/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 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qa/suites/rgw/crypt/4-tests/s3tests.yaml b/qa/suites/rgw/crypt/4-tests/s3tests.yaml index 9f52fee08e001..f713f0b952b5c 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-octopus 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..c3d24c6c5a737 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-octopus rgw_server: client.0 stages: prepare - ragweed: client.0: - default-branch: ceph-master + default-branch: ceph-octopus 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..d234060bdaf35 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-octopus rgw_server: client.0 overrides: ceph: diff --git a/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml b/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml index e691920f744a0..5e95c99880786 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-octopus 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..2788a8866504c 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-octopus 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..976b7b35efd5a 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-octopus 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..a0ab98f2f2029 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-octopus rgw_server: client.0 rgw_website_server: client.1 -- 2.39.5