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

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

diff --git a/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/nautilus.yaml b/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/nautilus.yaml
index 2a3104cb8c0923843216e1a9ab8853e6f1e4b329..0ed40672cb0a66c69853823e33402b5a27d35b37 100644 (file)
--- a/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/nautilus.yaml
+++ b/qa/suites/upgrade/nautilus-x/parallel/1-ceph-install/nautilus.yaml
@@ -35,6 +35,9 @@ tasks:
     mon.b:
     mon.c:
 - print: "**** done install.upgrade non-client hosts"
+- rgw:
+   - client.1
+- print: "**** done => started rgw client.1"
 - parallel:
     - workload
     - upgrade-sequence

diff --git a/qa/suites/upgrade/nautilus-x/parallel/2-workload/rgw_ragweed_prepare.yaml b/qa/suites/upgrade/nautilus-x/parallel/2-workload/rgw_ragweed_prepare.yaml
index ab68649008bf87652e0eba3f20663c7d1a0f37f4..7c8dd21a2a125d6711eb88a654b8384e58ea1e22 100644 (file)
--- a/qa/suites/upgrade/nautilus-x/parallel/2-workload/rgw_ragweed_prepare.yaml
+++ b/qa/suites/upgrade/nautilus-x/parallel/2-workload/rgw_ragweed_prepare.yaml
@@ -4,8 +4,6 @@ meta:
 workload:
   full_sequential:
   - sequential:
-    - rgw:
-      - client.1
     - ragweed:
         client.1:
           default-branch: ceph-master

diff --git a/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-all.yaml
index 7fb9829a4a9225802d5a22c5494e1b6128cf161a..e8349b690ff186fedbe8069a8191f9ac1d90ddca 100644 (file)
--- a/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-all.yaml
+++ b/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-all.yaml
@@ -16,7 +16,7 @@ upgrade-sequence:
        wait-for-healthy: false
        wait-for-osds-up: true
    - ceph.restart:
-       daemons: [mds.a]
+       daemons: [mds.a, rgw.*]
        wait-for-healthy: false
        wait-for-osds-up: true
    - print: "**** done ceph.restart all"

diff --git a/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index 2d9349e050c8e8380f278fa69422259e1507ad39..6f0b9ae714673e94d550265163763156cda3c258 100644 (file)
--- a/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/qa/suites/upgrade/nautilus-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -4,6 +4,7 @@ meta:
    upgrate in two steps
    step one ordering: mon.a, osd.0, osd.1, mds.a
    step two ordering: mon.b, mon.c, osd.2, osd.3
+   step three ordering: client.1
    ceph expected to be healthy state after each step
 upgrade-sequence:
    sequential:
@@ -45,3 +46,8 @@ upgrade-sequence:
        wait-for-healthy: true
    - sleep:
        duration: 60
+   - ceph.restart:
+       daemons: [rgw.*]
+       wait-for-healthy: true
+   - sleep:
+       duration: 60

diff --git a/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw.yaml b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw.yaml
index 00855dc5606ea7e71bfeead2d587ab08969aac7f..de95994729031365b0ee72aeed2595fd068b3cbc 100644 (file)
--- a/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw.yaml
+++ b/qa/suites/upgrade/nautilus-x/parallel/5-final-workload/rgw.yaml
@@ -3,6 +3,5 @@ overrides:
     frontend: civetweb
 tasks:
   - sequential:
-    - rgw: [client.1]
-    - print: "**** done rgw 4-final-workload"
     - rgw-final-workload
+    - print: "**** done rgw 4-final-workload"