From 2d451ec510a9968be8d4f21b28e1d918da94c9ea Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Wed, 17 Jun 2026 14:33:45 -0400 Subject: [PATCH] tentacle: qa/rgw: Remove 'force-branch' from s3tests configs Signed-off-by: Adam C. Emerson --- qa/suites/smoke/basic/tasks/test/rgw_ec_s3tests.yaml | 1 - qa/suites/smoke/basic/tasks/test/rgw_s3tests.yaml | 1 - qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml | 1 - qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml | 1 - qa/suites/teuthology/rgw/tasks/s3tests.yaml | 1 - 5 files changed, 5 deletions(-) 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 495161d78ed..3214fd9009b 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,6 @@ tasks: - tox: [client.0] - s3tests: client.0: - force-branch: ceph-tentacle 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 a7c2771d026..e8c4296dc86 100644 --- a/qa/suites/smoke/basic/tasks/test/rgw_s3tests.yaml +++ b/qa/suites/smoke/basic/tasks/test/rgw_s3tests.yaml @@ -7,7 +7,6 @@ tasks: - tox: [client.0] - s3tests: client.0: - force-branch: ceph-tentacle 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 74da6e5bce9..08ceb25c357 100644 --- a/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml +++ b/qa/suites/teuthology/rgw/tasks/s3tests-fastcgi.yaml @@ -11,7 +11,6 @@ tasks: - s3tests: client.0: rgw_server: client.0 - force-branch: ceph-tentacle 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 63d8c72d457..1746b5bbe73 100644 --- a/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml +++ b/qa/suites/teuthology/rgw/tasks/s3tests-fcgi.yaml @@ -12,7 +12,6 @@ tasks: - s3tests: client.0: rgw_server: client.0 - force-branch: ceph-tentacle overrides: ceph: fs: xfs diff --git a/qa/suites/teuthology/rgw/tasks/s3tests.yaml b/qa/suites/teuthology/rgw/tasks/s3tests.yaml index 79a604d9988..beaffbbde45 100644 --- a/qa/suites/teuthology/rgw/tasks/s3tests.yaml +++ b/qa/suites/teuthology/rgw/tasks/s3tests.yaml @@ -11,7 +11,6 @@ tasks: - s3tests: client.0: rgw_server: client.0 - force-branch: ceph-tentacle overrides: ceph: fs: xfs -- 2.47.3