qa/rgw: tests target ceph-mimic branches

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

diff --git a/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml b/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml
index 3114b3a46e34cf642bfe04cedfe493736e03a88d..1e1e452c20f2a81cbb19d0d41f68b54cfa91bfad 100644 (file)
--- a/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml
+++ b/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml
@@ -4,12 +4,12 @@ tasks:
 - rgw: [client.0]
 - ragweed:
     client.0:
-      force-branch: ceph-master
+      force-branch: ceph-mimic
       rgw_server: client.0
       stages: prepare
 - ragweed:
     client.0:
-      force-branch: ceph-master
+      force-branch: ceph-mimic
       rgw_server: client.0
       stages: check
 overrides:

diff --git a/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml b/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml
index 4cdded04e768a166f187af236bfba07225bbf73b..f2d717a7d4c25d8d90ef92e2d2058a65771d84d3 100644 (file)
--- a/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml
+++ b/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml
@@ -4,7 +4,7 @@ tasks:
 - rgw: [client.0]
 - s3tests:
     client.0:
-      force-branch: ceph-master
+      force-branch: ceph-mimic
       rgw_server: client.0
 overrides:
   ceph:

diff --git a/qa/suites/rgw/multifs/tasks/rgw_swift.yaml b/qa/suites/rgw/multifs/tasks/rgw_swift.yaml
index 569741b0e150abf1729ceff9bfed04197506532b..bf4b30555ecfa349daa30bca87f60b9636ae7a01 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-mimic
       rgw_server: client.0

diff --git a/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml b/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml
index 45047ea410b4aedc0e34c0d78fb662fe5ef04666..35a6c4d2244ec0f57a32c26e9327cca099b1ae10 100644 (file)
--- a/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml
+++ b/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml
@@ -1,7 +1,7 @@
 tasks:
 - s3tests:
     client.0:
-      force-branch: ceph-master
+      force-branch: ceph-mimic
       rgw_server: client.0
 overrides:
   ceph:

diff --git a/qa/suites/rgw/thrash/workload/rgw_swift.yaml b/qa/suites/rgw/thrash/workload/rgw_swift.yaml
index 45e2fc9cc30882bee3082e922ea8bd6325fc5f2d..3d9b397c01dcfac1256d13966f73c3c3a346702d 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-mimic
       rgw_server: client.0

diff --git a/qa/suites/rgw/verify/tasks/rgw_tests.yaml b/qa/suites/rgw/verify/tasks/rgw_tests.yaml
index e04492c551afbc444f8eb9bd3bcdf19da4c107cc..c7095285c59b3af5ae00fc17942f99a7348d3ae9 100644 (file)
--- a/qa/suites/rgw/verify/tasks/rgw_tests.yaml
+++ b/qa/suites/rgw/verify/tasks/rgw_tests.yaml
@@ -11,14 +11,15 @@ tasks:
       valgrind: [--tool=memcheck]
 - s3tests:
     client.0:
-      force-branch: ceph-master
+      force-branch: ceph-mimic
       rgw_server: client.0
 - swift:
     client.0:
+      force-branch: ceph-mimic
       rgw_server: client.0
 - ragweed:
     client.0:
-      force-branch: ceph-master
+      force-branch: ceph-mimic
       rgw_server: client.0
       stages: prepare,check
 overrides:

diff --git a/qa/suites/upgrade/luminous-x/parallel/2-workload/rgw_ragweed_prepare.yaml b/qa/suites/upgrade/luminous-x/parallel/2-workload/rgw_ragweed_prepare.yaml
index b7a7739b4ba43568a1d73e9a267b3e34e3733b13..40a6c0fe4f2cbc32f3f63176460c163bdadb76d8 100644 (file)
--- a/qa/suites/upgrade/luminous-x/parallel/2-workload/rgw_ragweed_prepare.yaml
+++ b/qa/suites/upgrade/luminous-x/parallel/2-workload/rgw_ragweed_prepare.yaml
@@ -8,7 +8,7 @@ workload:
       - client.1
     - ragweed:
         client.1:
-          force-branch: ceph-master
+          force-branch: ceph-mimic
           rgw_server: client.1
           stages: prepare
     - print: "**** done rgw ragweed prepare 2-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_ragweed_check.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_ragweed_check.yaml
index 72233b2edf6f8160f787360171b72bfe9a4054f0..c98da096b2e0f62718a6385ba6344cce24f5874a 100644 (file)
--- a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_ragweed_check.yaml
+++ b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_ragweed_check.yaml
@@ -5,7 +5,7 @@ rgw-final-workload:
   full_sequential:
   - ragweed:
       client.1:
-        force-branch: ceph-master
+        force-branch: ceph-mimic
         rgw_server: client.1
         stages: check
   - print: "**** done ragweed check 4-final-workload"

diff --git a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_swift.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_swift.yaml
index 45c136fa8f79b64577fd2a38511ba9818ac236b8..a61a67123fa9247807601a2952869ee0c10ffccf 100644 (file)
--- a/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_swift.yaml
+++ b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_swift.yaml
@@ -5,6 +5,6 @@ rgw-final-workload:
   full_sequential:
   - swift:
       client.1:
-        force-branch: ceph-master
+        force-branch: ceph-mimic
         rgw_server: client.1
   - print: "**** done swift 4-final-workload"