Fixed upgrade steps flow

Signed-off-by: Yuri Weinstein <yuri.weinstein@inktank.com>

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/dumpling-firefly-x/parallel/3-upgrade-sequence/upgrade-all.yaml
index a0b3d3603120a86ec74a1c0b7f842dc56fd58364..5d1f60b6e6d4a296d8649d2d70b8f34499d03c5a 100644 (file)
--- a/suites/upgrade/dumpling-firefly-x/parallel/3-upgrade-sequence/upgrade-all.yaml
+++ b/suites/upgrade/dumpling-firefly-x/parallel/3-upgrade-sequence/upgrade-all.yaml
@@ -2,5 +2,9 @@ upgrade-sequence0:
    sequential:
    - install.upgrade:
        mon.a:
+         branch: firefly
        mon.b:
+         branch: firefly
+   - print: "**** done install.upgrade firefly for mon.a and mon.b"
    - ceph.restart: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3]
+   - print: "**** done ceph.restart the cluster"

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/4-firefly-upgrade/firefly.yaml b/suites/upgrade/dumpling-firefly-x/parallel/4-firefly-upgrade/firefly.yaml
index 4e925d0972a508d1f40d747e6aa5ee3d236392d0..ac8a53c50aa3bb8ba6865d56242a2d5243ee8275 100644 (file)
--- a/suites/upgrade/dumpling-firefly-x/parallel/4-firefly-upgrade/firefly.yaml
+++ b/suites/upgrade/dumpling-firefly-x/parallel/4-firefly-upgrade/firefly.yaml
@@ -1,14 +1,4 @@
 tasks:
-   - install.upgrade:
-       mon.a:
-         branch: firefly
-       mon.b:
-         branch: firefly
-       client.0:
-         branch: firefly
-   - print: "**** done install.upgrade"
-   - ceph.restart:
-   - print: "**** done restart"
    - parallel:
      - workload2
      - upgrade-sequence