Force S3-tests to select ceph-nautilus branch for Nautilus runs.

Signed-off-by: Tejas Chandramouli <tchandra@tchandra.blr.csb>

diff --git a/qa/suites/rados/basic/tasks/rgw_snaps.yaml b/qa/suites/rados/basic/tasks/rgw_snaps.yaml
index 2a9746391e9e2eeab50076a622d1f30fa1777df6..c94b7b2bafd9f07537b55fd725be898d3df53d87 100644 (file)
--- 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-nautilus
       rgw_server: client.0
       readwrite:
         bucket: rwtest

diff --git a/qa/suites/rgw/thrash/workload/rgw_readwrite.yaml b/qa/suites/rgw/thrash/workload/rgw_readwrite.yaml
index e4e68286848ed3822d8b3bf0fc7cbdeb9630bdb0..d67d5263891850f7b70d2f3f4b62af57e17e538c 100644 (file)
--- 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-nautilus
       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 621683aeb1b852de218cbdbfd8e1b22c395ae530..b4b9806d5d897739c5e46d0ec943486abf1aed02 100644 (file)
--- 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-nautilus
       rgw_server: client.0
       roundtrip:
         bucket: rttest