From a7a083d74698841a0cc7c524fa47b0f60f0290cc Mon Sep 17 00:00:00 2001 From: Ali Maredia Date: Thu, 2 Jan 2020 09:14:20 -0500 Subject: [PATCH] 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 --- qa/machine_types/vps.yaml | 1 - qa/rgw_pool_type/ec-profile.yaml | 1 - qa/rgw_pool_type/ec.yaml | 1 - 3 files changed, 3 deletions(-) diff --git a/qa/machine_types/vps.yaml b/qa/machine_types/vps.yaml index 9a38e25170e9a..64a3da47d4e3c 100644 --- 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 1103039c539da..05384cb5309a5 100644 --- 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 d290e38ed4005..7c99b7f85c8ee 100644 --- 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 -- 2.39.5