From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 4 May 2018 15:27:42 +0000 (-0400)
Subject: qa/rgw: tests target ceph-mimic branches
X-Git-Tag: v13.2.0~35^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a98c7c453dee4f37a5b63cccb584b6e8da1e43db;p=ceph.git

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 3114b3a46e34..1e1e452c20f2 100644
--- 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 4cdded04e768..f2d717a7d4c2 100644
--- 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 569741b0e150..bf4b30555ecf 100644
--- 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 45047ea410b4..35a6c4d2244e 100644
--- 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 45e2fc9cc308..3d9b397c01dc 100644
--- 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 e04492c551af..c7095285c59b 100644
--- 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 b7a7739b4ba4..40a6c0fe4f2c 100644
--- 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 72233b2edf6f..c98da096b2e0 100644
--- 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 45c136fa8f79..a61a67123fa9 100644
--- 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"