Merge pull request #32462 from alimaredia/wip-s3-tests-branch-override-remove

qa: remove force-branch from overrides of s3-tests Reviewed-by: Casey Bodley <cbodley@redhat.com>
2025-02-24 19:47:44 +00:00 · 2020-01-09 14:48:44 -05:00 · 2020-01-09 14:48:44 -05:00 · c0a1b533f9
commit c0a1b533f9
parent bae0c67395 a7a083d746
3 changed files with 0 additions and 3 deletions
--- a/qa/machine_types/vps.yaml
+++ b/qa/machine_types/vps.yaml
@ -7,7 +7,6 @@ overrides:
        mon lease: 15
        mon lease ack timeout: 25
  s3tests:
-    force-branch: ceph-master
    idle_timeout: 1200
  ceph-fuse:
    client.0:
--- a/qa/rgw_pool_type/ec-profile.yaml
+++ b/qa/rgw_pool_type/ec-profile.yaml
@ -7,5 +7,4 @@ overrides:
      m: 1
      crush-failure-domain: osd
  s3tests:
-    force-branch: ceph-master
    slow_backend: true
--- a/qa/rgw_pool_type/ec.yaml
+++ b/qa/rgw_pool_type/ec.yaml
@ -2,5 +2,4 @@ overrides:
  rgw:
    ec-data-pool: true
  s3tests:
-    force-branch: ceph-master
    slow_backend: true