From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 9 Mar 2018 21:26:09 +0000 (-0500)
Subject: qa: add ragweed to luminous-x upgrade suite
X-Git-Tag: v14.0.0~196^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F21707%2Fhead;p=ceph.git

qa: add ragweed to luminous-x upgrade suite

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

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
new file mode 100644
index 000000000000..b7a7739b4ba4
--- /dev/null
+++ b/qa/suites/upgrade/luminous-x/parallel/2-workload/rgw_ragweed_prepare.yaml
@@ -0,0 +1,14 @@
+meta:
+- desc: |
+   rgw ragweed prepare
+workload:
+  full_sequential:
+  - sequential:
+    - rgw:
+      - client.1
+    - ragweed:
+        client.1:
+          force-branch: ceph-master
+          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.yaml b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw.yaml
new file mode 100644
index 000000000000..00855dc5606e
--- /dev/null
+++ b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw.yaml
@@ -0,0 +1,8 @@
+overrides:
+  rgw:
+    frontend: civetweb
+tasks:
+  - sequential:
+    - rgw: [client.1]
+    - print: "**** done rgw 4-final-workload"
+    - rgw-final-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
new file mode 100644
index 000000000000..72233b2edf6f
--- /dev/null
+++ b/qa/suites/upgrade/luminous-x/parallel/5-final-workload/rgw_ragweed_check.yaml
@@ -0,0 +1,11 @@
+meta:
+- desc: |
+    ragweed check for rgw
+rgw-final-workload:
+  full_sequential:
+  - ragweed:
+      client.1:
+        force-branch: ceph-master
+        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 7a7659ff4f1c..45c136fa8f79 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
@@ -1,13 +1,10 @@
 meta:
 - desc: |
    swift api tests for rgw
-overrides:
-  rgw:
-    frontend: civetweb
-tasks:
-  - rgw: [client.1]
-  - print: "**** done rgw 4-final-workload"
+rgw-final-workload:
+  full_sequential:
   - swift:
       client.1:
+        force-branch: ceph-master
         rgw_server: client.1
   - print: "**** done swift 4-final-workload"