From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 19 Jun 2019 19:31:44 +0000 (-0700)
Subject: qa/tests: added ragweed coverage to stress-split* upgrade suites
X-Git-Tag: v14.2.2~22^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5e7e1f382ffbe1515ce6629dda480041260af448;p=ceph.git

qa/tests: added ragweed coverage to stress-split* upgrade suites

added ceph config set global bluestore_warn_on_legacy_statfs fals
chnaged user "foo" to "ragweed" in ragweed.py

Fixes: http://tracker.ceph.com/issues/40452
Fices: http://tracker.ceph.com/issues/40467
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
---

diff --git a/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml b/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml
index 9cb248b3e5b8a..6c9bd0d2160ce 100644
--- a/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml
+++ b/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml
@@ -33,6 +33,7 @@ tasks:
     conf:
       global:
         mon warn on pool no app: false
+        bluestore_warn_on_legacy_statfs: false
 - exec:
     osd.0:
       - ceph osd require-osd-release mimic
diff --git a/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml b/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml
index 19a4d56355260..ad5b0e236101b 100644
--- a/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml
+++ b/qa/suites/upgrade/mimic-x/stress-split/1-ceph-install/mimic.yaml
@@ -13,6 +13,9 @@ tasks:
     extra_packages: ['librados2']
 - print: "**** done install mimic"
 - ceph:
+    conf:
+      global:
+        bluestore_warn_on_legacy_statfs: false
 - exec:
     osd.0:
       - ceph osd require-osd-release mimic
diff --git a/qa/suites/upgrade/mimic-x/stress-split/4-workload/rgw_ragweed_prepare.yaml b/qa/suites/upgrade/mimic-x/stress-split/4-workload/rgw_ragweed_prepare.yaml
new file mode 100644
index 0000000000000..b1f06bcc96251
--- /dev/null
+++ b/qa/suites/upgrade/mimic-x/stress-split/4-workload/rgw_ragweed_prepare.yaml
@@ -0,0 +1,14 @@
+meta:
+- desc: |
+   rgw ragweed prepare before upgrade
+stress-tasks:
+  - full_sequential:
+     - sequential:
+       - rgw:
+         - client.0
+       - ragweed:
+           client.0:
+             default-branch: ceph-nautilus
+             rgw_server: client.0
+             stages: prepare
+       - print: "**** done rgw ragweed prepare 4-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
new file mode 100644
index 0000000000000..39734ef8571b6
--- /dev/null
+++ b/qa/suites/upgrade/mimic-x/stress-split/7-final-workload/rgw-swift-ragweed_check.yaml
@@ -0,0 +1,18 @@
+meta:
+- desc: |
+   swift api tests for rgw
+   rgw ragweed check after upgrade
+tasks:
+- rgw:
+    client.0:
+- print: "**** done rgw 7-workload"
+- swift:
+    client.0:
+      rgw_server: client.0
+- print: "**** done swift 7-workload"
+- ragweed:
+    client.0:
+      default-branch: ceph-nautilus
+      rgw_server: client.0
+      stages: check
+- print: "**** done rgw ragweed check 7-workload"
diff --git a/qa/suites/upgrade/mimic-x/stress-split/7-final-workload/rgw-swift.yaml b/qa/suites/upgrade/mimic-x/stress-split/7-final-workload/rgw-swift.yaml
deleted file mode 100644
index 76e5d6fc23158..0000000000000
--- a/qa/suites/upgrade/mimic-x/stress-split/7-final-workload/rgw-swift.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-meta:
-- desc: |
-   swift api tests for rgw
-tasks:
-- rgw:
-    client.0:
-- print: "**** done rgw 9-workload"
-- swift:
-    client.0:
-      rgw_server: client.0
-- print: "**** done swift 9-workload"
diff --git a/qa/tasks/ragweed.py b/qa/tasks/ragweed.py
index a68c71500edcd..ca67ee2f82e91 100644
--- a/qa/tasks/ragweed.py
+++ b/qa/tasks/ragweed.py
@@ -119,7 +119,7 @@ def create_users(ctx, config, run_stages):
 
     log.info('Creating rgw users...')
     testdir = teuthology.get_testdir(ctx)
-    users = {'user regular': 'foo', 'user system': 'sysuser'}
+    users = {'user regular': 'ragweed', 'user system': 'sysuser'}
     for client in config['clients']:
         if not 'prepare' in run_stages[client]:
             # should have been prepared in a previous run