From 2e3ea53b41cacc4b4bbc4ffe7342fb00233009cf Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 1 Mar 2017 13:58:07 -0600 Subject: [PATCH] qa/suites/upgrade/jewel-x/parallel: fix upgrade to luminous Signed-off-by: Sage Weil --- .../jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml | 9 +++------ qa/suites/upgrade/jewel-x/parallel/4-kraken.yaml | 1 - qa/suites/upgrade/jewel-x/parallel/4-luminous.yaml | 1 + 3 files changed, 4 insertions(+), 7 deletions(-) delete mode 120000 qa/suites/upgrade/jewel-x/parallel/4-kraken.yaml create mode 120000 qa/suites/upgrade/jewel-x/parallel/4-luminous.yaml diff --git a/qa/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml b/qa/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml index 02cba21c2c8..6a0f82986b1 100644 --- a/qa/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml +++ b/qa/suites/upgrade/jewel-x/parallel/3-upgrade-sequence/upgrade-all.yaml @@ -4,12 +4,9 @@ meta: upgrade-sequence: sequential: - ceph.restart: - daemons: [mon.a, mon.b, mon.c, mds.a, osd.0, osd.1, osd.2, osd.3] + daemons: [mon.a, mon.b, mon.c] + - ceph.restart: + daemons: [mds.a, osd.0, osd.1, osd.2, osd.3] wait-for-healthy: false wait-for-osds-up: true - - exec: - mon.a: - - ceph osd set require_kraken_osds - - ceph.restart: - daemons: [osd.0] - print: "**** done ceph.restart all" diff --git a/qa/suites/upgrade/jewel-x/parallel/4-kraken.yaml b/qa/suites/upgrade/jewel-x/parallel/4-kraken.yaml deleted file mode 120000 index a890722e139..00000000000 --- a/qa/suites/upgrade/jewel-x/parallel/4-kraken.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../releases/kraken.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/jewel-x/parallel/4-luminous.yaml b/qa/suites/upgrade/jewel-x/parallel/4-luminous.yaml new file mode 120000 index 00000000000..5283ac73e1b --- /dev/null +++ b/qa/suites/upgrade/jewel-x/parallel/4-luminous.yaml @@ -0,0 +1 @@ +../../../../releases/luminous.yaml \ No newline at end of file