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 569741b0e150abf1729ceff9bfed04197506532b..e959e0ace281f67166342a73f32fe65052d18340 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-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 45e2fc9cc30882bee3082e922ea8bd6325fc5f2d..dcb1c1ac318e2f3b716ab4743ce2226366b88f56 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-nautilus
       rgw_server: client.0

diff --git a/qa/suites/rgw/verify/tasks/swift.yaml b/qa/suites/rgw/verify/tasks/swift.yaml
index 45e2fc9cc30882bee3082e922ea8bd6325fc5f2d..dcb1c1ac318e2f3b716ab4743ce2226366b88f56 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-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 57c7226e341e2aca264b34ec71f1fcc6281bdb16..2db995b01d855c69ec419889aeb0676d54202ae3 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-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 76e5d6fc231586451c2292d89bceb3478c0db73c..1b5710b145a0535a8253e8ab4bd4a214f1c880b9 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-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 76e5d6fc231586451c2292d89bceb3478c0db73c..1b5710b145a0535a8253e8ab4bd4a214f1c880b9 100644 (file)
--- 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 39734ef8571b69c0b03f7ff0b0aa591c9693f1f9..8867a40945ecf3810f92ea1d939cfd2d59b73f84 100644 (file)
--- 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 76e5d6fc231586451c2292d89bceb3478c0db73c..1b5710b145a0535a8253e8ab4bd4a214f1c880b9 100644 (file)
--- 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"