From 017aa9cfe8362e8512a581e39850ce70bd1ce82f Mon Sep 17 00:00:00 2001 From: Adam King Date: Sun, 17 Apr 2022 12:21:44 -0400 Subject: [PATCH] qa/suites/orch/cephadm: stop upgrade tests if failures are seen Otherwise the tests may run forever. This was already done for mds upgrade sequence, justadding it in the other two places here Related to: https://tracker.ceph.com/issues/53939 Signed-off-by: Adam King --- .../orch/cephadm/mgr-nfs-upgrade/3-upgrade-with-workload.yaml | 2 +- qa/suites/orch/cephadm/upgrade/4-wait.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/3-upgrade-with-workload.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/3-upgrade-with-workload.yaml index 6d10b3576e2ed..362e0373416ea 100644 --- a/qa/suites/orch/cephadm/mgr-nfs-upgrade/3-upgrade-with-workload.yaml +++ b/qa/suites/orch/cephadm/mgr-nfs-upgrade/3-upgrade-with-workload.yaml @@ -16,7 +16,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 ; 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 orch upgrade status ; sleep 30 ; done - ceph orch ps - ceph versions - echo "wait for servicemap items w/ changing names to refresh" diff --git a/qa/suites/orch/cephadm/upgrade/4-wait.yaml b/qa/suites/orch/cephadm/upgrade/4-wait.yaml index dfac1847afdc2..58afe00c5be88 100644 --- a/qa/suites/orch/cephadm/upgrade/4-wait.yaml +++ b/qa/suites/orch/cephadm/upgrade/4-wait.yaml @@ -2,7 +2,7 @@ tasks: - cephadm.shell: env: [sha1] mon.a: - - while ceph orch upgrade status | jq '.in_progress' | grep true ; do ceph orch ps ; ceph versions ; 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 orch upgrade status ; sleep 30 ; done - ceph orch ps - ceph versions - echo "wait for servicemap items w/ changing names to refresh" -- 2.39.5