From 1c5526de412d7141500d1c42555f8ca027c28036 Mon Sep 17 00:00:00 2001 From: tamil Date: Mon, 20 Oct 2014 14:37:33 -0700 Subject: [PATCH] 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 --- .../upgrade-client-first.yaml | 35 +++++++++++++++++++ .../firefly-x/stress-split/5-workload/+ | 0 .../firefly-x/stress-split/7-workload/+ | 0 .../stress-split/8-next-mon/monc.yaml | 2 -- 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 suites/upgrade/dumpling-firefly-x/parallel/3-upgrade-sequence/upgrade-client-first.yaml create mode 100644 suites/upgrade/firefly-x/stress-split/5-workload/+ create mode 100644 suites/upgrade/firefly-x/stress-split/7-workload/+ 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 index 0000000000000..6ee00a39a1e24 --- /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 index 0000000000000..e69de29bb2d1d diff --git a/suites/upgrade/firefly-x/stress-split/7-workload/+ b/suites/upgrade/firefly-x/stress-split/7-workload/+ new file mode 100644 index 0000000000000..e69de29bb2d1d 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 73f22bd5f7cfc..e9273236ba331 100644 --- 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 -- 2.39.5