qa: remove force-branch from overrides of s3-tests

Changing the branch name in the section where
force-branch is defined for s3-tests does not work
because of overrides to the force-branch.

The overrides should not be there in the first place.

Signed-off-by: Ali Maredia <amaredia@redhat.com>

diff --git a/qa/machine_types/vps.yaml b/qa/machine_types/vps.yaml
index 9a38e25170e9a60fc3e849523e7166de27d87e98..64a3da47d4e3c799b34f2f053792905643894d24 100644 (file)
--- 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:

diff --git a/qa/rgw_pool_type/ec-profile.yaml b/qa/rgw_pool_type/ec-profile.yaml
index 1103039c539da7c32c2229198bf0825a1f58fb1f..05384cb5309a5f5f4b51adc0ec3d701e7ae25311 100644 (file)
--- 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

diff --git a/qa/rgw_pool_type/ec.yaml b/qa/rgw_pool_type/ec.yaml
index d290e38ed4005a23dbadc335407919d197d03d9b..7c99b7f85c8ee27510f10b15fb293a0bfab86f78 100644 (file)
--- 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