From a4423a7e5c4b71cea0a41a66be73304669d382dd Mon Sep 17 00:00:00 2001 From: Adam King Date: Fri, 11 Mar 2022 15:25:36 -0500 Subject: [PATCH] qa/suites/fs: stop looping in mds upgrade test if upgrade failed Signed-off-by: Adam King (cherry picked from commit 37019aad80aec15f9a34301c6051f065eb913e29) --- .../mds_upgrade_sequence/tasks/3-upgrade-with-workload.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/3-upgrade-with-workload.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/3-upgrade-with-workload.yaml index 200c4dcb58bb3..457b7e3c7ff8b 100644 --- a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/3-upgrade-with-workload.yaml +++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/3-upgrade-with-workload.yaml @@ -15,7 +15,7 @@ upgrade-tasks: - cephadm.shell: env: [sha1] host.a: - - while ceph orch upgrade status | jq '.in_progress' | grep true ; do ceph orch ps ; ceph versions ; ceph fs dump; sleep 30 ; done + - while ceph orch upgrade status | jq '.in_progress' | grep true && ! ceph orch upgrade status | jq '.message' | grep Error ; do ceph orch ps ; ceph versions ; ceph fs dump; ceph orch upgrade status ; sleep 30 ; done - ceph orch ps - ceph versions - echo "wait for servicemap items w/ changing names to refresh" -- 2.39.5