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

added rgw into upgrade sequence to improve coverage - splits
See https://github.com/ceph/ceph/pull/29234 https://github.com/ceph/ceph/pull/29282

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 6c9bd0d2160ce86e9368edc13ae873b8206a4a33..e2807604746d4662165bfb7b6ae597fed19d35a2 100644 (file)
--- a/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml
+++ b/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml
@@ -44,6 +44,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/mimic-x/parallel/2-workload/rgw_ragweed_prepare.yaml b/qa/suites/upgrade/mimic-x/parallel/2-workload/rgw_ragweed_prepare.yaml
index ab68649008bf87652e0eba3f20663c7d1a0f37f4..7c8dd21a2a125d6711eb88a654b8384e58ea1e22 100644 (file)
--- a/qa/suites/upgrade/mimic-x/parallel/2-workload/rgw_ragweed_prepare.yaml
+++ b/qa/suites/upgrade/mimic-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/mimic-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/qa/suites/upgrade/mimic-x/parallel/3-upgrade-sequence/upgrade-all.yaml
index 15a3271fe8c4e57ebb52ce955ae114df664fdcc9..6f27c2bc970e5f1356c760d5517c7bc455f4bcd4 100644 (file)
--- a/qa/suites/upgrade/mimic-x/parallel/3-upgrade-sequence/upgrade-all.yaml
+++ b/qa/suites/upgrade/mimic-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, mds.b]
+       daemons: [mds.a, mds.b,rgw.*]
        wait-for-healthy: false
        wait-for-osds-up: true
    - print: "**** done ceph.restart all"

diff --git a/qa/suites/upgrade/mimic-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/qa/suites/upgrade/mimic-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index cf8b716440e48a56eff5902a358ad96e3ff82c55..d4f1ee8d7d890fb88fddd056f8d7cd7e5ad42626 100644 (file)
--- a/qa/suites/upgrade/mimic-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/qa/suites/upgrade/mimic-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -2,8 +2,14 @@ meta:
 - desc: |
    upgrade the ceph cluster,
    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 one ordering: mon.a
+   step two ordering: mon.b,mgr.x
+   step three ordering: mon.c
+   step four ordering: osd.0, osd.1
+   step five ordering: mds.a, msd.b
+   step six ordering: osd.4, osd.5
+   step seven ordering: osd.2, osd.3
+   step eight ordering: rgw.*
    ceph expected to be healthy state after each step
 upgrade-sequence:
    sequential:
@@ -13,7 +19,7 @@ upgrade-sequence:
    - sleep:
        duration: 60
    - ceph.restart:
-       daemons: [mon.b, mgr.x]
+       daemons: [mon.b, mgr.x,rgw.*]
        wait-for-healthy: true
        mon-health-to-clog: false
    - sleep:
@@ -49,3 +55,10 @@ upgrade-sequence:
        wait-for-osds-up: true
    - sleep:
        duration: 60
+   - ceph.restart:
+       daemons: [rgw.*]
+       wait-for-healthy: false
+       wait-for-osds-up: true
+   - sleep:
+       duration: 60
+

diff --git a/qa/suites/upgrade/mimic-x/parallel/5-final-workload/rgw.yaml b/qa/suites/upgrade/mimic-x/parallel/5-final-workload/rgw.yaml
index 00855dc5606ea7e71bfeead2d587ab08969aac7f..de95994729031365b0ee72aeed2595fd068b3cbc 100644 (file)
--- a/qa/suites/upgrade/mimic-x/parallel/5-final-workload/rgw.yaml
+++ b/qa/suites/upgrade/mimic-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"

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 ad5b0e236101b9d7673987e275f2fe0acf877a4f..b1fe5f92597d83659e1ce9e20cd3dfe263e0d4bc 100644 (file)
--- 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
@@ -21,6 +21,9 @@ tasks:
       - ceph osd require-osd-release mimic
       - ceph osd set-require-min-compat-client mimic
 - print: "**** done ceph"
+- rgw:
+   - client.0
+- print: "**** done => started rgw client.0"
 overrides:
   ceph:
     conf:

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
index b1f06bcc96251e42592278850cfaab41a242cbe2..8adde7ef570a22d1262ad24f8a5fc314b59ff03b 100644 (file)
--- 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
@@ -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/mimic-x/stress-split/5-finish-upgrade.yaml b/qa/suites/upgrade/mimic-x/stress-split/5-finish-upgrade.yaml
index a76cda76fbaee6e6125247d2d4c9c5e9c58f81ef..bbaaad60c498c6094c6343444d26252a371c2681 100644 (file)
--- a/qa/suites/upgrade/mimic-x/stress-split/5-finish-upgrade.yaml
+++ b/qa/suites/upgrade/mimic-x/stress-split/5-finish-upgrade.yaml
@@ -3,12 +3,13 @@ tasks:
     osd.8:
     client.0:
 - ceph.restart:
-    daemons: [osd.8, osd.9, osd.10, osd.11]
+    daemons: [osd.8, osd.9, osd.10, osd.11,rgw.*]
     wait-for-healthy: false
     wait-for-osds-up: true
+- print: "**** done restarted/upgraded => osd.8, osd.9, osd.10, osd.11, rgw.*"
 - exec:
     osd.0:
       - ceph osd set pglog_hardlimit
       - ceph osd dump --format=json-pretty | grep "flags"
-- print: "**** try to set pglog_hardlimit again, should succeed"
+- print: "**** done try to set pglog_hardlimit again, should succeed"
 

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
index 39734ef8571b69c0b03f7ff0b0aa591c9693f1f9..734a5f494a0d0358afa01ad3b88a2b5b038bd4c2 100644 (file)
--- 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
@@ -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