upgrade/dumpling-x: do not upgrade client host

If we are running against a mixed cluster for the duration of the upgrade,
we need to make sure we are running the *old* client tests against the
cluster.  Do not upgrade client.0.

Fixes: #7574
Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-all.yaml
index 9aebbf50e369285107218abb495c87bc44ae72c2..f5d10cdfcaba80b1f6092fc4aba46f1d856c5885 100644 (file)
--- a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-all.yaml
+++ b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-all.yaml
@@ -1,4 +1,6 @@
 upgrade-sequence:
    sequential:
    - install.upgrade:
+       mon.a:
+       mon.b:
    - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]

diff --git a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mds-mon-osd.yaml b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
index df65c74e385d592fcba29c3d51121e485cbc109f..2cf81f7b3a98ca9a2c9b71c15489f6d0b74a5999 100644 (file)
--- a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
+++ b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mds-mon-osd.yaml
@@ -1,7 +1,8 @@
 upgrade-sequence:
    sequential:
    - install.upgrade:
-      all:
+       mon.a:
+       mon.b:
    - ceph.restart: [mds.a]
    - sleep:
        duration: 60

diff --git a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
index 25eb6e48413fc75f34b1db06ae25efd93e4476be..fe9a18c4ee8c726ad97554e303da02b90272df9b 100644 (file)
--- a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
+++ b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml
@@ -1,7 +1,8 @@
 upgrade-sequence:
    sequential:
    - install.upgrade:
-      all:
+       mon.a:
+       mon.b:
    - ceph.restart:
        daemons: [mon.a]
        wait-for-healthy: false

diff --git a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-osd-mon-mds.yaml b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
index e497800d547a211cb39d68916486a356b726841e..353d805a84c9449517cb07e0a5a0f7a34aa2464b 100644 (file)
--- a/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
+++ b/suites/upgrade/dumpling-x/parallel/3-upgrade-sequence/upgrade-osd-mon-mds.yaml
@@ -1,7 +1,8 @@
 upgrade-sequence:
    sequential:
    - install.upgrade:
-      all:
+       mon.a:
+       mon.b:
    - ceph.restart: [osd.0]
    - sleep:
        duration: 60