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

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

diff --git a/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml b/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml
index e41f47ad0db5de8059f2819dde739ce8e414c995..4a4b48aeb13e05596c327023baeb1d114c25affe 100644 (file)
--- a/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml
+++ b/qa/suites/rados/upgrade/jewel-x-singleton/8-workload/rgw-swift.yaml
@@ -7,5 +7,6 @@ tasks:
 - print: "**** done rgw 9-workload"
 - swift:
     client.0:
+      force-branch: ceph-luminous
       rgw_server: client.0
 - print: "**** done swift 9-workload"

diff --git a/qa/suites/rgw/multifs/tasks/rgw_swift.yaml b/qa/suites/rgw/multifs/tasks/rgw_swift.yaml
index 569741b0e150abf1729ceff9bfed04197506532b..4451d152c76f44444e2b45c93f0ae837f23b6d3c 100644 (file)
--- 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-luminous
       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 45e2fc9cc30882bee3082e922ea8bd6325fc5f2d..61041c648c22b70a5efbee4f8eb3b7256ada2735 100644 (file)
--- 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-luminous
       rgw_server: client.0

diff --git a/qa/suites/rgw/verify/tasks/swift.yaml b/qa/suites/rgw/verify/tasks/swift.yaml
index 45e2fc9cc30882bee3082e922ea8bd6325fc5f2d..61041c648c22b70a5efbee4f8eb3b7256ada2735 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-luminous
       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..9add4c00ae1d7816bd9469696c2aeb37c6e256d3 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-luminous
       rgw_server: client.0

diff --git a/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rgw_swift.yaml b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rgw_swift.yaml
index 780c4ad706510e15439f400587445e59f2e9ecbd..d676486c299513c0a7d99e8c172177d795ca6a01 100644 (file)
--- a/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rgw_swift.yaml
+++ b/qa/suites/upgrade/jewel-x/parallel/7-final-workload/rgw_swift.yaml
@@ -9,5 +9,6 @@ tasks:
   - print: "**** done rgw 7-final-workload"
   - swift:
       client.1:
+        force-branch: ceph-luminous
         rgw_server: client.1
   - print: "**** done swift 7-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..aca66ba62a7843b1853f469df5159233a56d749b 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-luminous
       rgw_server: client.0
 - print: "**** done swift 9-workload"

diff --git a/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rgw_swift.yaml b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rgw_swift.yaml
index 7a7659ff4f1c239c6a9d8f90597428ccbf5346a6..45e9f3a3a37cbdf8cfffa304e522ffd7bfe88ba6 100644 (file)
--- a/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rgw_swift.yaml
+++ b/qa/suites/upgrade/kraken-x/parallel/7-final-workload/rgw_swift.yaml
@@ -9,5 +9,6 @@ tasks:
   - print: "**** done rgw 4-final-workload"
   - swift:
       client.1:
+        force-branch: ceph-luminous
         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..aca66ba62a7843b1853f469df5159233a56d749b 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-luminous
       rgw_server: client.0
 - print: "**** done swift 9-workload"

diff --git a/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/7-final-workload/rgw-swift.yaml b/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/7-final-workload/rgw-swift.yaml
index 76e5d6fc231586451c2292d89bceb3478c0db73c..aca66ba62a7843b1853f469df5159233a56d749b 100644 (file)
--- a/qa/suites/upgrade/luminous-p2p/luminous-p2p-stress-split/7-final-workload/rgw-swift.yaml
+++ b/qa/suites/upgrade/luminous-p2p/luminous-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-luminous
       rgw_server: client.0
 - print: "**** done swift 9-workload"