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 76e5d6fc231586451c2292d89bceb3478c0db73c..8d25a6d38bed6d6e8e0314400479bbacc1be64d9 100644 (file)
--- 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 45e2fc9cc30882bee3082e922ea8bd6325fc5f2d..3d9b397c01dcfac1256d13966f73c3c3a346702d 100644 (file)
--- 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 57c7226e341e2aca264b34ec71f1fcc6281bdb16..32a0dd89fa648c961453cde63739225daae2be20 100644 (file)
--- 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 7a7659ff4f1c239c6a9d8f90597428ccbf5346a6..5110970a392486662e71a7f49843e72e7d9814ba 100644 (file)
--- 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 76e5d6fc231586451c2292d89bceb3478c0db73c..8d25a6d38bed6d6e8e0314400479bbacc1be64d9 100644 (file)
--- 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 7a7659ff4f1c239c6a9d8f90597428ccbf5346a6..5110970a392486662e71a7f49843e72e7d9814ba 100644 (file)
--- 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 76e5d6fc231586451c2292d89bceb3478c0db73c..8d25a6d38bed6d6e8e0314400479bbacc1be64d9 100644 (file)
--- 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 76e5d6fc231586451c2292d89bceb3478c0db73c..8d25a6d38bed6d6e8e0314400479bbacc1be64d9 100644 (file)
--- 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 76e5d6fc231586451c2292d89bceb3478c0db73c..8d25a6d38bed6d6e8e0314400479bbacc1be64d9 100644 (file)
--- 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"