From 898702d58f3e26c41713e44625fcf357841f52af Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Mon, 13 Feb 2017 22:04:17 +0100 Subject: [PATCH] tests: add require_jewel_osds to upgrade/hammer-x/tiering Without this, the test tends to fail, but sometimes passes (apparently because the "wait-for-healthy: true" in the last ceph.restart is racy - HEALTH_OK is received before the MONs notice that all OSDs are running jewel without require_jewel_osds. Signed-off-by: Nathan Cutler --- qa/suites/upgrade/hammer-x/tiering/3-upgrade/upgrade.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/qa/suites/upgrade/hammer-x/tiering/3-upgrade/upgrade.yaml b/qa/suites/upgrade/hammer-x/tiering/3-upgrade/upgrade.yaml index e43b6b674b09b..1627dbedaca8b 100644 --- a/qa/suites/upgrade/hammer-x/tiering/3-upgrade/upgrade.yaml +++ b/qa/suites/upgrade/hammer-x/tiering/3-upgrade/upgrade.yaml @@ -71,9 +71,15 @@ upgrade-second-half: duration: 60 - ceph.restart: daemons: [osd.3] - wait-for-healthy: true + wait-for-healthy: false + wait-for-osds-up: true - sleep: duration: 60 + - exec: + mon.a: + - ceph osd set require_jewel_osds + - ceph.healthy: + - print: "**** HEALTH_OK reached after upgrading last OSD to jewel" flip-but-fail: sequential: -- 2.47.3