From: Ali Maredia <amaredia@redhat.com>
Date: Thu, 12 Dec 2019 21:09:07 +0000 (-0500)
Subject: qa: add force-branch to suites running s3readwrite & s3roundtrip tasks
X-Git-Tag: v15.1.0~523^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32225%2Fhead;p=ceph.git

qa: add force-branch to suites running s3readwrite & s3roundtrip tasks

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

diff --git a/qa/suites/rados/basic/tasks/rgw_snaps.yaml b/qa/suites/rados/basic/tasks/rgw_snaps.yaml
index 2a9746391e9e..fdc9f2a51fed 100644
--- a/qa/suites/rados/basic/tasks/rgw_snaps.yaml
+++ b/qa/suites/rados/basic/tasks/rgw_snaps.yaml
@@ -28,6 +28,7 @@ tasks:
     - default.rgw.log
 - s3readwrite:
     client.0:
+      force-branch: ceph-master
       rgw_server: client.0
       readwrite:
         bucket: rwtest
diff --git a/qa/suites/rgw/multifs/tasks/rgw_readwrite.yaml b/qa/suites/rgw/multifs/tasks/rgw_readwrite.yaml
index c7efaa1c7579..84f013e223a0 100644
--- a/qa/suites/rgw/multifs/tasks/rgw_readwrite.yaml
+++ b/qa/suites/rgw/multifs/tasks/rgw_readwrite.yaml
@@ -4,6 +4,7 @@ tasks:
 - rgw: [client.0]
 - s3readwrite:
     client.0:
+      force-branch: ceph-master
       rgw_server: client.0
       readwrite:
         bucket: rwtest
diff --git a/qa/suites/rgw/multifs/tasks/rgw_roundtrip.yaml b/qa/suites/rgw/multifs/tasks/rgw_roundtrip.yaml
index 47b3c1894a22..07ae92454589 100644
--- a/qa/suites/rgw/multifs/tasks/rgw_roundtrip.yaml
+++ b/qa/suites/rgw/multifs/tasks/rgw_roundtrip.yaml
@@ -4,6 +4,7 @@ tasks:
 - rgw: [client.0]
 - s3roundtrip:
     client.0:
+      force-branch: ceph-master
       rgw_server: client.0
       roundtrip:
         bucket: rttest
diff --git a/qa/suites/rgw/thrash/workload/rgw_readwrite.yaml b/qa/suites/rgw/thrash/workload/rgw_readwrite.yaml
index e4e68286848e..c24ac7441dd0 100644
--- a/qa/suites/rgw/thrash/workload/rgw_readwrite.yaml
+++ b/qa/suites/rgw/thrash/workload/rgw_readwrite.yaml
@@ -1,6 +1,7 @@
 tasks:
 - s3readwrite:
     client.0:
+      force-branch: ceph-master
       rgw_server: client.0
       readwrite:
         bucket: rwtest
diff --git a/qa/suites/rgw/thrash/workload/rgw_roundtrip.yaml b/qa/suites/rgw/thrash/workload/rgw_roundtrip.yaml
index 621683aeb1b8..56a88603280c 100644
--- a/qa/suites/rgw/thrash/workload/rgw_roundtrip.yaml
+++ b/qa/suites/rgw/thrash/workload/rgw_roundtrip.yaml
@@ -1,6 +1,7 @@
 tasks:
 - s3roundtrip:
     client.0:
+      force-branch: ceph-master
       rgw_server: client.0
       roundtrip:
         bucket: rttest