fixed firefly-x suite to not upgrade mon.c twice and optimized the suite as well.

included another upgrade combination to dumpling-firefly-x suite

Signed-off-by: tamil <tamil.muthamizhan@inktank.com>

diff --git a/suites/upgrade/dumpling-firefly-x/parallel/3-upgrade-sequence/upgrade-client-first.yaml b/suites/upgrade/dumpling-firefly-x/parallel/3-upgrade-sequence/upgrade-client-first.yaml
new file mode 100644 (file)
index 0000000..6ee00a3
--- /dev/null
+++ b/suites/upgrade/dumpling-firefly-x/parallel/3-upgrade-sequence/upgrade-client-first.yaml
@@ -0,0 +1,35 @@
+upgrade-sequence:
+   sequential:
+   - install.upgrade:
+       client.0:
+   - print: "**** done install.upgrade client.0 to the version from teuthology-suite arg"
+   - install.upgrade:
+       mon.a:
+   - ceph.restart:
+       daemons: [mon.a]
+       wait-for-healthy: true
+   - sleep:
+       duration: 60
+   - print: "**** done install.upgrade mon.a to the version from teuthology-suite arg"
+   - install.upgrade:
+       mon.b:
+   - ceph.restart:
+       daemons: [mon.b, mon.c]
+       wait-for-healthy: true
+   - sleep:
+       duration: 60
+   - print: "**** done install.upgrade mon.b and mon.c to the version from teuthology-suite arg"
+   - ceph.restart: [mds.a]
+   - sleep:
+       duration: 60
+   - ceph.restart:
+       daemons: [osd.0, osd.1]
+       wait-for-healthy: true
+   - sleep:
+       duration: 60
+   - print: "**** done install.upgrade osd.0 and osd.1 to the version from teuthology-suite arg"
+   - ceph.restart:
+       daemons: [osd.2, osd.3]
+       wait-for-healthy: true
+   - sleep:
+       duration: 60

diff --git a/suites/upgrade/firefly-x/stress-split/5-workload/+ b/suites/upgrade/firefly-x/stress-split/5-workload/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/firefly-x/stress-split/7-workload/+ b/suites/upgrade/firefly-x/stress-split/7-workload/+
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/suites/upgrade/firefly-x/stress-split/8-next-mon/monc.yaml b/suites/upgrade/firefly-x/stress-split/8-next-mon/monc.yaml
index 73f22bd5f7cfce78763d0ab1da3d8df918fc1191..e9273236ba331e80825fb773f9da7371e256452f 100644 (file)
--- a/suites/upgrade/firefly-x/stress-split/8-next-mon/monc.yaml
+++ b/suites/upgrade/firefly-x/stress-split/8-next-mon/monc.yaml
@@ -1,6 +1,4 @@
 tasks:
-- install.upgrade:
-    mon.c:
 - ceph.restart:
     daemons: [mon.c]
     wait-for-healthy: false