qa/tests: added rgw into upgrade sequence to improve coverage - splits

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.yaml b/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.yaml
index 5bcb3eaed6e0a192e45c14a95272fa4e83b2de7a..b1d523f539649be6e5fdded6024649ffee4111c4 100644 (file)
--- a/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.yaml
+++ b/qa/suites/upgrade/nautilus-x/stress-split/1-ceph-install/nautilus.yaml
@@ -13,6 +13,9 @@ tasks:
       - ceph osd require-osd-release nautilus
       - ceph osd set-require-min-compat-client nautilus
 - print: "**** done ceph"
+- rgw:
+   - client.0
+- print: "**** done => started rgw client.0"
 overrides:
   ceph:
     conf:

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rgw_ragweed_prepare.yaml b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rgw_ragweed_prepare.yaml
index b1f06bcc96251e42592278850cfaab41a242cbe2..8adde7ef570a22d1262ad24f8a5fc314b59ff03b 100644 (file)
--- a/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rgw_ragweed_prepare.yaml
+++ b/qa/suites/upgrade/nautilus-x/stress-split/4-workload/rgw_ragweed_prepare.yaml
@@ -4,8 +4,6 @@ meta:
 stress-tasks:
   - full_sequential:
      - sequential:
-       - rgw:
-         - client.0
        - ragweed:
            client.0:
              default-branch: ceph-nautilus

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/5-finish-upgrade.yaml b/qa/suites/upgrade/nautilus-x/stress-split/5-finish-upgrade.yaml
index 306445c8fbf445e9799eee3055337c678558787d..6061fbe4c651fc3ba8587169cc8329a3fa0f3f6c 100644 (file)
--- a/qa/suites/upgrade/nautilus-x/stress-split/5-finish-upgrade.yaml
+++ b/qa/suites/upgrade/nautilus-x/stress-split/5-finish-upgrade.yaml
@@ -3,9 +3,10 @@ tasks:
     osd.8:
     client.0:
 - ceph.restart:
-    daemons: [mon.c, osd.8, osd.9, osd.10, osd.11]
+    daemons: [mon.c, osd.8, osd.9, osd.10, osd.11, rgw.*]
     wait-for-healthy: false
     wait-for-osds-up: true
+- print: "**** restarted/upgrated => mon.c, osd.8, osd.9, osd.10, osd.11, rgw.*"
 - exec:
     osd.0:
       - ceph osd set pglog_hardlimit

diff --git a/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/rgw-swift-ragweed_check.yaml b/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/rgw-swift-ragweed_check.yaml
index 39734ef8571b69c0b03f7ff0b0aa591c9693f1f9..734a5f494a0d0358afa01ad3b88a2b5b038bd4c2 100644 (file)
--- a/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/rgw-swift-ragweed_check.yaml
+++ b/qa/suites/upgrade/nautilus-x/stress-split/7-final-workload/rgw-swift-ragweed_check.yaml
@@ -3,9 +3,6 @@ meta:
    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