qa/suites/fs: stop looping in mds upgrade test if upgrade failed

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 37019aad80aec15f9a34301c6051f065eb913e29)

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 200c4dcb58bb34a3c8f600b4b762b190b399df7e..457b7e3c7ff8b3bbde287d0b1d721d8a21c050be 100644 (file)
--- 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"