From e63ff36b7c06071872a2692431492884e73549bd Mon Sep 17 00:00:00 2001 From: Ali Maredia Date: Tue, 12 Jul 2022 16:21:27 -0400 Subject: rgw: add .yaml that configures s3tests branch for rgw suite Signed-off-by: Ali Maredia --- qa/rgw/s3tests-branch.yaml | 4 ++++ qa/suites/rgw/cloud-transition/s3tests-branch.yaml | 1 + qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml | 1 - qa/suites/rgw/crypt/4-tests/s3tests.yaml | 1 - qa/suites/rgw/crypt/s3tests-branch.yaml | 1 + qa/suites/rgw/dbstore/s3tests-branch.yaml | 1 + qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml | 1 - qa/suites/rgw/lifecycle/s3tests-branch.yaml | 1 + qa/suites/rgw/lifecycle/tasks/rgw_s3tests.yaml | 1 - qa/suites/rgw/multifs/s3tests-branch.yaml | 1 + qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml | 1 - qa/suites/rgw/sts/s3tests-branch.yaml | 1 + qa/suites/rgw/sts/tasks/first.yaml | 1 - qa/suites/rgw/sts/tasks/ststests.yaml | 1 - qa/suites/rgw/thrash/s3tests-branch.yaml | 1 + qa/suites/rgw/thrash/workload/rgw_s3tests.yaml | 1 - qa/suites/rgw/verify/s3tests-branch.yaml | 1 + qa/suites/rgw/verify/tasks/s3tests.yaml | 1 - qa/suites/rgw/website/s3tests-branch.yaml | 1 + qa/suites/rgw/website/tasks/s3tests-website.yaml | 1 - 20 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 qa/rgw/s3tests-branch.yaml create mode 120000 qa/suites/rgw/cloud-transition/s3tests-branch.yaml create mode 120000 qa/suites/rgw/crypt/s3tests-branch.yaml create mode 120000 qa/suites/rgw/dbstore/s3tests-branch.yaml create mode 120000 qa/suites/rgw/lifecycle/s3tests-branch.yaml create mode 120000 qa/suites/rgw/multifs/s3tests-branch.yaml create mode 120000 qa/suites/rgw/sts/s3tests-branch.yaml create mode 120000 qa/suites/rgw/thrash/s3tests-branch.yaml create mode 120000 qa/suites/rgw/verify/s3tests-branch.yaml create mode 120000 qa/suites/rgw/website/s3tests-branch.yaml (limited to 'qa') diff --git a/qa/rgw/s3tests-branch.yaml b/qa/rgw/s3tests-branch.yaml new file mode 100644 index 00000000000..ef6819c87e0 --- /dev/null +++ b/qa/rgw/s3tests-branch.yaml @@ -0,0 +1,4 @@ +overrides: + s3tests: + force-branch: ceph-master + # git_remote: https://github.com/ceph/ diff --git a/qa/suites/rgw/cloud-transition/s3tests-branch.yaml b/qa/suites/rgw/cloud-transition/s3tests-branch.yaml new file mode 120000 index 00000000000..bdcaca48ae0 --- /dev/null +++ b/qa/suites/rgw/cloud-transition/s3tests-branch.yaml @@ -0,0 +1 @@ +.qa/rgw/s3tests-branch.yaml \ No newline at end of file diff --git a/qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml b/qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml index a263883c85c..a001334cbbc 100644 --- a/qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml +++ b/qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml @@ -47,7 +47,6 @@ tasks: #cloud_access_key: "87654321" - s3tests: client.0: - force-branch: ceph-master rgw_server: client.0 storage classes: LUKEWARM, FROZEN extra_attrs: ["cloud_transition"] diff --git a/qa/suites/rgw/crypt/4-tests/s3tests.yaml b/qa/suites/rgw/crypt/4-tests/s3tests.yaml index 791528508a0..d6d1e5ee6ef 100644 --- a/qa/suites/rgw/crypt/4-tests/s3tests.yaml +++ b/qa/suites/rgw/crypt/4-tests/s3tests.yaml @@ -1,7 +1,6 @@ tasks: - s3tests: client.0: - force-branch: ceph-master barbican: kms_key: my-key-1 kms_key2: my-key-2 diff --git a/qa/suites/rgw/crypt/s3tests-branch.yaml b/qa/suites/rgw/crypt/s3tests-branch.yaml new file mode 120000 index 00000000000..bdcaca48ae0 --- /dev/null +++ b/qa/suites/rgw/crypt/s3tests-branch.yaml @@ -0,0 +1 @@ +.qa/rgw/s3tests-branch.yaml \ No newline at end of file diff --git a/qa/suites/rgw/dbstore/s3tests-branch.yaml b/qa/suites/rgw/dbstore/s3tests-branch.yaml new file mode 120000 index 00000000000..bdcaca48ae0 --- /dev/null +++ b/qa/suites/rgw/dbstore/s3tests-branch.yaml @@ -0,0 +1 @@ +.qa/rgw/s3tests-branch.yaml \ No newline at end of file diff --git a/qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml b/qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml index 4c8764e4bab..f53bdca4941 100644 --- a/qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml +++ b/qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml @@ -9,7 +9,6 @@ tasks: - sudo chmod 0777 /var/lib/ceph/radosgw/dbstore-default_ns.db - s3tests: client.0: - force-branch: ceph-master dbstore_tests: True rgw_server: client.0 extra_attrs: ["!fails_on_rgw,!fails_on_dbstore"] diff --git a/qa/suites/rgw/lifecycle/s3tests-branch.yaml b/qa/suites/rgw/lifecycle/s3tests-branch.yaml new file mode 120000 index 00000000000..bdcaca48ae0 --- /dev/null +++ b/qa/suites/rgw/lifecycle/s3tests-branch.yaml @@ -0,0 +1 @@ +.qa/rgw/s3tests-branch.yaml \ No newline at end of file diff --git a/qa/suites/rgw/lifecycle/tasks/rgw_s3tests.yaml b/qa/suites/rgw/lifecycle/tasks/rgw_s3tests.yaml index ee9962d06b5..9bae70cdbe5 100644 --- a/qa/suites/rgw/lifecycle/tasks/rgw_s3tests.yaml +++ b/qa/suites/rgw/lifecycle/tasks/rgw_s3tests.yaml @@ -4,7 +4,6 @@ tasks: - rgw: [client.0] - s3tests: client.0: - force-branch: ceph-master rgw_server: client.0 storage classes: LUKEWARM, FROZEN extra_attrs: ["lifecycle"] diff --git a/qa/suites/rgw/multifs/s3tests-branch.yaml b/qa/suites/rgw/multifs/s3tests-branch.yaml new file mode 120000 index 00000000000..bdcaca48ae0 --- /dev/null +++ b/qa/suites/rgw/multifs/s3tests-branch.yaml @@ -0,0 +1 @@ +.qa/rgw/s3tests-branch.yaml \ No newline at end of file diff --git a/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml b/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml index 4cdded04e76..302628759e9 100644 --- a/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml +++ b/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml @@ -4,7 +4,6 @@ tasks: - rgw: [client.0] - s3tests: client.0: - force-branch: ceph-master rgw_server: client.0 overrides: ceph: diff --git a/qa/suites/rgw/sts/s3tests-branch.yaml b/qa/suites/rgw/sts/s3tests-branch.yaml new file mode 120000 index 00000000000..bdcaca48ae0 --- /dev/null +++ b/qa/suites/rgw/sts/s3tests-branch.yaml @@ -0,0 +1 @@ +.qa/rgw/s3tests-branch.yaml \ No newline at end of file diff --git a/qa/suites/rgw/sts/tasks/first.yaml b/qa/suites/rgw/sts/tasks/first.yaml index 61427f359a5..db785ba73fe 100644 --- a/qa/suites/rgw/sts/tasks/first.yaml +++ b/qa/suites/rgw/sts/tasks/first.yaml @@ -6,7 +6,6 @@ tasks: - s3tests: client.0: sts_tests: True - force-branch: ceph-master rgw_server: client.0 extra_attrs: ['webidentity_test'] overrides: diff --git a/qa/suites/rgw/sts/tasks/ststests.yaml b/qa/suites/rgw/sts/tasks/ststests.yaml index 10c2f2aed78..175071b892f 100644 --- a/qa/suites/rgw/sts/tasks/ststests.yaml +++ b/qa/suites/rgw/sts/tasks/ststests.yaml @@ -3,7 +3,6 @@ tasks: client.0: sts_tests: True extra_attrs: ["test_of_sts"] - force-branch: ceph-master rgw_server: client.0 overrides: ceph: diff --git a/qa/suites/rgw/thrash/s3tests-branch.yaml b/qa/suites/rgw/thrash/s3tests-branch.yaml new file mode 120000 index 00000000000..bdcaca48ae0 --- /dev/null +++ b/qa/suites/rgw/thrash/s3tests-branch.yaml @@ -0,0 +1 @@ +.qa/rgw/s3tests-branch.yaml \ No newline at end of file diff --git a/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml b/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml index e691920f744..e93a049fd54 100644 --- a/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml +++ b/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml @@ -1,7 +1,6 @@ tasks: - s3tests: client.0: - force-branch: ceph-master rgw_server: client.0 overrides: ceph: diff --git a/qa/suites/rgw/verify/s3tests-branch.yaml b/qa/suites/rgw/verify/s3tests-branch.yaml new file mode 120000 index 00000000000..bdcaca48ae0 --- /dev/null +++ b/qa/suites/rgw/verify/s3tests-branch.yaml @@ -0,0 +1 @@ +.qa/rgw/s3tests-branch.yaml \ No newline at end of file diff --git a/qa/suites/rgw/verify/tasks/s3tests.yaml b/qa/suites/rgw/verify/tasks/s3tests.yaml index b5aef9b044b..573cffbc30a 100644 --- a/qa/suites/rgw/verify/tasks/s3tests.yaml +++ b/qa/suites/rgw/verify/tasks/s3tests.yaml @@ -1,5 +1,4 @@ tasks: - s3tests: client.0: - force-branch: ceph-master rgw_server: client.0 diff --git a/qa/suites/rgw/website/s3tests-branch.yaml b/qa/suites/rgw/website/s3tests-branch.yaml new file mode 120000 index 00000000000..bdcaca48ae0 --- /dev/null +++ b/qa/suites/rgw/website/s3tests-branch.yaml @@ -0,0 +1 @@ +.qa/rgw/s3tests-branch.yaml \ No newline at end of file diff --git a/qa/suites/rgw/website/tasks/s3tests-website.yaml b/qa/suites/rgw/website/tasks/s3tests-website.yaml index 9ca6fcfbdb0..40859846471 100644 --- a/qa/suites/rgw/website/tasks/s3tests-website.yaml +++ b/qa/suites/rgw/website/tasks/s3tests-website.yaml @@ -12,6 +12,5 @@ tasks: dns-s3website-name: s3-website. - s3tests: client.0: - force-branch: ceph-master rgw_server: client.0 rgw_website_server: client.1 -- cgit v1.2.3