From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 5 Dec 2019 16:30:38 +0000 (-0500)
Subject: qa/rgw: add missing force-branch: ceph-nautilus for swift tasks
X-Git-Tag: v14.2.8~28^2~2^2~23^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a4f15fc6ae03627725379fbf433c72ce8d935a8d;p=ceph.git

qa/rgw: add missing force-branch: ceph-nautilus for swift tasks

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/qa/suites/rgw/multifs/tasks/rgw_swift.yaml b/qa/suites/rgw/multifs/tasks/rgw_swift.yaml
index 569741b0e15..e959e0ace28 100644
--- a/qa/suites/rgw/multifs/tasks/rgw_swift.yaml
+++ b/qa/suites/rgw/multifs/tasks/rgw_swift.yaml
@@ -4,4 +4,5 @@ tasks:
 - rgw: [client.0]
 - swift:
     client.0:
+      force-branch: ceph-nautilus
       rgw_server: client.0
diff --git a/qa/suites/rgw/thrash/workload/rgw_swift.yaml b/qa/suites/rgw/thrash/workload/rgw_swift.yaml
index 45e2fc9cc30..dcb1c1ac318 100644
--- a/qa/suites/rgw/thrash/workload/rgw_swift.yaml
+++ b/qa/suites/rgw/thrash/workload/rgw_swift.yaml
@@ -1,4 +1,5 @@
 tasks:
 - swift:
     client.0:
+      force-branch: ceph-nautilus
       rgw_server: client.0
diff --git a/qa/suites/rgw/verify/tasks/swift.yaml b/qa/suites/rgw/verify/tasks/swift.yaml
index 45e2fc9cc30..dcb1c1ac318 100644
--- a/qa/suites/rgw/verify/tasks/swift.yaml
+++ b/qa/suites/rgw/verify/tasks/swift.yaml
@@ -1,4 +1,5 @@
 tasks:
 - swift:
     client.0:
+      force-branch: ceph-nautilus
       rgw_server: client.0
diff --git a/qa/suites/smoke/basic/tasks/rgw_swift.yaml b/qa/suites/smoke/basic/tasks/rgw_swift.yaml
index 57c7226e341..2db995b01d8 100644
--- a/qa/suites/smoke/basic/tasks/rgw_swift.yaml
+++ b/qa/suites/smoke/basic/tasks/rgw_swift.yaml
@@ -5,4 +5,5 @@ tasks:
 - rgw: [client.0]
 - swift:
     client.0:
+      force-branch: ceph-nautilus
       rgw_server: client.0
diff --git a/qa/suites/upgrade/luminous-x/stress-split/7-final-workload/rgw-swift.yaml b/qa/suites/upgrade/luminous-x/stress-split/7-final-workload/rgw-swift.yaml
index 76e5d6fc231..1b5710b145a 100644
--- a/qa/suites/upgrade/luminous-x/stress-split/7-final-workload/rgw-swift.yaml
+++ b/qa/suites/upgrade/luminous-x/stress-split/7-final-workload/rgw-swift.yaml
@@ -7,5 +7,6 @@ tasks:
 - print: "**** done rgw 9-workload"
 - swift:
     client.0:
+      force-branch: ceph-nautilus
       rgw_server: client.0
 - print: "**** done swift 9-workload"
diff --git a/qa/suites/upgrade/mimic-x-singleton/8-workload/rgw-swift.yaml b/qa/suites/upgrade/mimic-x-singleton/8-workload/rgw-swift.yaml
index 76e5d6fc231..1b5710b145a 100644
--- a/qa/suites/upgrade/mimic-x-singleton/8-workload/rgw-swift.yaml
+++ b/qa/suites/upgrade/mimic-x-singleton/8-workload/rgw-swift.yaml
@@ -7,5 +7,6 @@ tasks:
 - print: "**** done rgw 9-workload"
 - swift:
     client.0:
+      force-branch: ceph-nautilus
       rgw_server: client.0
 - print: "**** done swift 9-workload"
diff --git a/qa/suites/upgrade/mimic-x/stress-split/7-final-workload/rgw-swift-ragweed_check.yaml b/qa/suites/upgrade/mimic-x/stress-split/7-final-workload/rgw-swift-ragweed_check.yaml
index 39734ef8571..8867a40945e 100644
--- a/qa/suites/upgrade/mimic-x/stress-split/7-final-workload/rgw-swift-ragweed_check.yaml
+++ b/qa/suites/upgrade/mimic-x/stress-split/7-final-workload/rgw-swift-ragweed_check.yaml
@@ -8,6 +8,7 @@ tasks:
 - print: "**** done rgw 7-workload"
 - swift:
     client.0:
+      force-branch: ceph-nautilus
       rgw_server: client.0
 - print: "**** done swift 7-workload"
 - ragweed:
diff --git a/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/7-final-workload/rgw-swift.yaml b/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/7-final-workload/rgw-swift.yaml
index 76e5d6fc231..1b5710b145a 100644
--- a/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/7-final-workload/rgw-swift.yaml
+++ b/qa/suites/upgrade/nautilus-p2p/nautilus-p2p-stress-split/7-final-workload/rgw-swift.yaml
@@ -7,5 +7,6 @@ tasks:
 - print: "**** done rgw 9-workload"
 - swift:
     client.0:
+      force-branch: ceph-nautilus
       rgw_server: client.0
 - print: "**** done swift 9-workload"