From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 5 Dec 2019 16:21:49 +0000 (-0500)
Subject: qa/rgw: add missing force-branch: ceph-mimic for swift tasks
X-Git-Tag: v13.2.8~2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32033%2Fhead;p=ceph.git

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

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

diff --git a/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/rgw-swift.yaml b/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/rgw-swift.yaml
index 76e5d6fc2315..8d25a6d38bed 100644
--- a/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/rgw-swift.yaml
+++ b/qa/suites/rados/upgrade/luminous-x-singleton/8-workload/rgw-swift.yaml
@@ -7,5 +7,6 @@ tasks:
 - print: "**** done rgw 9-workload"
 - swift:
     client.0:
+      force-branch: ceph-mimic
       rgw_server: client.0
 - print: "**** done swift 9-workload"
diff --git a/qa/suites/rgw/verify/tasks/swift.yaml b/qa/suites/rgw/verify/tasks/swift.yaml
index 45e2fc9cc308..3d9b397c01dc 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-mimic
       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 57c7226e341e..32a0dd89fa64 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-mimic
       rgw_server: client.0
diff --git a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rgw_swift.yaml b/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rgw_swift.yaml
index 7a7659ff4f1c..5110970a3924 100644
--- a/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rgw_swift.yaml
+++ b/qa/suites/upgrade/jewel-x/parallel/5-final-workload/rgw_swift.yaml
@@ -9,5 +9,6 @@ tasks:
   - print: "**** done rgw 4-final-workload"
   - swift:
       client.1:
+        force-branch: ceph-mimic
         rgw_server: client.1
   - print: "**** done swift 4-final-workload"
diff --git a/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/rgw-swift.yaml b/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/rgw-swift.yaml
index 76e5d6fc2315..8d25a6d38bed 100644
--- a/qa/suites/upgrade/jewel-x/stress-split/7-final-workload/rgw-swift.yaml
+++ b/qa/suites/upgrade/jewel-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-mimic
       rgw_server: client.0
 - print: "**** done swift 9-workload"
diff --git a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rgw_swift.yaml b/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rgw_swift.yaml
index 7a7659ff4f1c..5110970a3924 100644
--- a/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rgw_swift.yaml
+++ b/qa/suites/upgrade/kraken-x/parallel/5-final-workload/rgw_swift.yaml
@@ -9,5 +9,6 @@ tasks:
   - print: "**** done rgw 4-final-workload"
   - swift:
       client.1:
+        force-branch: ceph-mimic
         rgw_server: client.1
   - print: "**** done swift 4-final-workload"
diff --git a/qa/suites/upgrade/kraken-x/stress-split/7-final-workload/rgw-swift.yaml b/qa/suites/upgrade/kraken-x/stress-split/7-final-workload/rgw-swift.yaml
index 76e5d6fc2315..8d25a6d38bed 100644
--- a/qa/suites/upgrade/kraken-x/stress-split/7-final-workload/rgw-swift.yaml
+++ b/qa/suites/upgrade/kraken-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-mimic
       rgw_server: client.0
 - print: "**** done swift 9-workload"
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 76e5d6fc2315..8d25a6d38bed 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-mimic
       rgw_server: client.0
 - print: "**** done swift 9-workload"
diff --git a/qa/suites/upgrade/mimic-p2p/mimic-p2p-stress-split/7-final-workload/rgw-swift.yaml b/qa/suites/upgrade/mimic-p2p/mimic-p2p-stress-split/7-final-workload/rgw-swift.yaml
index 76e5d6fc2315..8d25a6d38bed 100644
--- a/qa/suites/upgrade/mimic-p2p/mimic-p2p-stress-split/7-final-workload/rgw-swift.yaml
+++ b/qa/suites/upgrade/mimic-p2p/mimic-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-mimic
       rgw_server: client.0
 - print: "**** done swift 9-workload"