From f11737a643617f9ccb9e6a5869c37c9320c28497 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 20 Jun 2017 10:37:24 +0800 Subject: [PATCH] qa/suites/upgrade/hammer-jewel-x: replace kraken.yaml with luminous.yaml * add mgr.x to roles * to setup mgr and set the require-osd-release bit in osdmap * do not restart an osd for waiting for healthy: the cluster is not healthy until the require-osd-release=luminous is set in osdmap, and a mgr is up and running. Fixes: http://tracker.ceph.com/issues/20342 Signed-off-by: Kefu Chai --- .../upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml | 1 + .../parallel/7-upgrade-sequence/upgrade-all.yaml | 5 ----- .../parallel/7-upgrade-sequence/upgrade-by-daemon.yaml | 4 ---- qa/suites/upgrade/hammer-jewel-x/parallel/8-kraken.yaml | 1 - qa/suites/upgrade/hammer-jewel-x/parallel/8-luminous.yaml | 1 + 5 files changed, 2 insertions(+), 10 deletions(-) delete mode 120000 qa/suites/upgrade/hammer-jewel-x/parallel/8-kraken.yaml create mode 120000 qa/suites/upgrade/hammer-jewel-x/parallel/8-luminous.yaml diff --git a/qa/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml index 9fa3ca31000..41f2afffb4a 100644 --- a/qa/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml +++ b/qa/suites/upgrade/hammer-jewel-x/parallel/0-cluster/start.yaml @@ -11,6 +11,7 @@ roles: - - mon.a - osd.0 - osd.1 + - mgr.x - - mon.b - mon.c - osd.2 diff --git a/qa/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml b/qa/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml index ddbb9ff4373..356f8adb52c 100644 --- a/qa/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml +++ b/qa/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-all.yaml @@ -7,9 +7,4 @@ upgrade-sequence2: daemons: [mon.a, mon.b, mon.c, 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/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml b/qa/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml index f59a152dc90..4fdab3edd54 100644 --- a/qa/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml +++ b/qa/suites/upgrade/hammer-jewel-x/parallel/7-upgrade-sequence/upgrade-by-daemon.yaml @@ -31,9 +31,5 @@ upgrade-sequence2: daemons: [osd.2, osd.3] wait-for-healthy: false wait-for-osds-up: true - - exec: - mon.a: - - ceph osd set require_kraken_osds - - ceph.restart: [osd.3] - sleep: duration: 60 diff --git a/qa/suites/upgrade/hammer-jewel-x/parallel/8-kraken.yaml b/qa/suites/upgrade/hammer-jewel-x/parallel/8-kraken.yaml deleted file mode 120000 index a890722e139..00000000000 --- a/qa/suites/upgrade/hammer-jewel-x/parallel/8-kraken.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../releases/kraken.yaml \ No newline at end of file diff --git a/qa/suites/upgrade/hammer-jewel-x/parallel/8-luminous.yaml b/qa/suites/upgrade/hammer-jewel-x/parallel/8-luminous.yaml new file mode 120000 index 00000000000..5283ac73e1b --- /dev/null +++ b/qa/suites/upgrade/hammer-jewel-x/parallel/8-luminous.yaml @@ -0,0 +1 @@ +../../../../releases/luminous.yaml \ No newline at end of file -- 2.39.5