From fcde1f6b9f1357e799fe65ce9baaf4b4bb517fbf Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 23 Mar 2016 20:30:30 -0400 Subject: [PATCH] suites/upgrade/hammer-x: do upgrade before staritng working Otherwise crushtool test will fail while creating pools. Signed-off-by: Sage Weil --- .../upgrade/hammer-x/parallel/1-hammer-install/hammer.yaml | 4 ++++ .../hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml | 4 ---- .../parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml | 6 ------ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/suites/upgrade/hammer-x/parallel/1-hammer-install/hammer.yaml b/suites/upgrade/hammer-x/parallel/1-hammer-install/hammer.yaml index 4b2c39d15deaf..e5bf1fcacb67a 100644 --- a/suites/upgrade/hammer-x/parallel/1-hammer-install/hammer.yaml +++ b/suites/upgrade/hammer-x/parallel/1-hammer-install/hammer.yaml @@ -5,6 +5,10 @@ tasks: - ceph: fs: xfs - print: "**** done ceph" +- install.upgrade: + mon.a: + mon.b: +- print: "**** done install.upgrade mon.a and mon.b" - parallel: - workload - upgrade-sequence diff --git a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml index 3f74d7d14a3cc..fe36f914aa1f1 100644 --- a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml +++ b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-all.yaml @@ -1,8 +1,4 @@ upgrade-sequence: sequential: - - install.upgrade: - mon.a: - mon.b: - - print: "**** done install.upgrade 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 all" diff --git a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml index ec5d3f907a2b7..8ad4e0a231203 100644 --- a/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml +++ b/suites/upgrade/hammer-x/parallel/3-upgrade-sequence/upgrade-mon-osd-mds.yaml @@ -1,8 +1,5 @@ upgrade-sequence: sequential: - - install.upgrade: - mon.a: - - print: "**** done install.upgrade mon.a to the version from teuthology-suite arg" - ceph.restart: daemons: [mon.a] wait-for-healthy: true @@ -22,9 +19,6 @@ upgrade-sequence: mon.b: - sudo ceph osd crush tunables hammer - print: "**** done ceph osd crush tunables hammer" - - install.upgrade: - mon.b: - - print: "**** done install.upgrade mon.b to the version from teuthology-suite arg" - ceph.restart: daemons: [mon.b, mon.c] wait-for-healthy: true -- 2.39.5