From ebc95b40ba6e54836e04ae11ea7c8608d4c11ad0 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 7 Mar 2024 16:08:05 -0500 Subject: [PATCH] qa/rgw: point rgw test repos at ceph-squid release branch Signed-off-by: Casey Bodley --- qa/rgw/s3tests-branch.yaml | 2 +- .../rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml | 2 +- qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml | 4 ++-- qa/suites/rgw/upgrade/1-install/quincy/overrides.yaml | 2 +- qa/suites/rgw/verify/tasks/ragweed.yaml | 2 +- qa/suites/rgw/verify/tasks/s3tests-java.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-fastcgi.yaml | 2 +- qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml | 2 +- qa/suites/teuthology/rgw/tasks/s3tests.yaml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qa/rgw/s3tests-branch.yaml b/qa/rgw/s3tests-branch.yaml index ef6819c87e0..6f19d61e4b0 100644 --- a/qa/rgw/s3tests-branch.yaml +++ b/qa/rgw/s3tests-branch.yaml @@ -1,4 +1,4 @@ overrides: s3tests: - force-branch: ceph-master + force-branch: ceph-squid # git_remote: https://github.com/ceph/ 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 39023173fce..ce83c3e11e1 100644 --- a/qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml +++ b/qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml @@ -55,7 +55,7 @@ tasks: lifecycle_tests: True cloudtier_tests: True #client.2: - #force-branch: ceph-master + #force-branch: ceph-squid #rgw_server: client.2 #storage classes: LUKEWARM, FROZEN #extra_attrs: ["cloud_transition"] diff --git a/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml b/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml index 66bdff817f5..494a408e0bc 100644 --- a/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml +++ b/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml @@ -5,11 +5,11 @@ tasks: - tox: [client.0] - ragweed: client.0: - default-branch: ceph-master + default-branch: ceph-squid rgw_server: client.0 stages: prepare - ragweed: client.0: - default-branch: ceph-master + default-branch: ceph-squid rgw_server: client.0 stages: check diff --git a/qa/suites/rgw/upgrade/1-install/quincy/overrides.yaml b/qa/suites/rgw/upgrade/1-install/quincy/overrides.yaml index ef9110a956d..bc008e67ebe 100644 --- a/qa/suites/rgw/upgrade/1-install/quincy/overrides.yaml +++ b/qa/suites/rgw/upgrade/1-install/quincy/overrides.yaml @@ -1,3 +1,3 @@ overrides: ragweed: - default-branch: ceph-master # ceph-quincy doesn't have tox, but tests are the same + default-branch: ceph-squid # ceph-quincy doesn't have tox, but tests are the same diff --git a/qa/suites/rgw/verify/tasks/ragweed.yaml b/qa/suites/rgw/verify/tasks/ragweed.yaml index 8fbd3cefb92..48f6c421551 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-squid rgw_server: client.0 stages: prepare,check diff --git a/qa/suites/rgw/verify/tasks/s3tests-java.yaml b/qa/suites/rgw/verify/tasks/s3tests-java.yaml index 9ad89cc6790..cbb1ab8b279 100644 --- a/qa/suites/rgw/verify/tasks/s3tests-java.yaml +++ b/qa/suites/rgw/verify/tasks/s3tests-java.yaml @@ -1,6 +1,6 @@ tasks: - s3tests-java: client.0: - force-branch: ceph-master + force-branch: ceph-squid force-repo: https://github.com/ceph/java_s3tests.git 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 8f824838cb1..ff1388fa690 100644 --- a/qa/suites/smoke/basic/tasks/test/rgw_ec_s3tests.yaml +++ b/qa/suites/smoke/basic/tasks/test/rgw_ec_s3tests.yaml @@ -10,7 +10,7 @@ tasks: - tox: [client.0] - s3tests: client.0: - force-branch: ceph-master + force-branch: ceph-squid 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 65f7ec16b51..e0ad7810f42 100644 --- a/qa/suites/smoke/basic/tasks/test/rgw_s3tests.yaml +++ b/qa/suites/smoke/basic/tasks/test/rgw_s3tests.yaml @@ -7,7 +7,7 @@ tasks: - tox: [client.0] - s3tests: client.0: - force-branch: ceph-master + force-branch: ceph-squid unit_test_scan: True rgw_server: client.0 overrides: diff --git a/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml b/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml index d76121fad10..8d4ebac003b 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-squid 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 8228501ca4b..53d3a9e8df1 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-squid overrides: ceph: fs: xfs diff --git a/qa/suites/teuthology/rgw/tasks/s3tests.yaml b/qa/suites/teuthology/rgw/tasks/s3tests.yaml index ee8e9d5b5dc..dd9d06711b6 100644 --- a/qa/suites/teuthology/rgw/tasks/s3tests.yaml +++ b/qa/suites/teuthology/rgw/tasks/s3tests.yaml @@ -11,7 +11,7 @@ tasks: - s3tests: client.0: rgw_server: client.0 - force-branch: ceph-master + force-branch: ceph-squid overrides: ceph: fs: xfs -- 2.39.5