Merge pull request ceph#59470 from adk3798/cephadm-staggered-upgrade-test-wait-check-rgw-versions

qa/cephadm: wait a bit before checking rgw daemons upgraded w/ `ceph versions`

Reviewed-by: Guillaume Abrioux <[email protected]>

Author: adk3798

qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml

@@ -131,8 +131,10 @@ tasks:
       - ceph orch upgrade start --image quay.ceph.io/ceph-ci/ceph:$sha1 --services rgw.foo
       - 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
       # verify all rgw daemons on same version and version hash matches what we are upgrading to
-      - ceph versions | jq -e '.rgw | length == 1'
+      # `ceph versions` might not get updated immediately for rgw so retry this
+      - time timeout 60 bash -c "until ceph versions | jq -e '.rgw | length == 1'; do sleep 2; done"
       - ceph versions | jq -e '.rgw | keys' | grep $sha1
       - ceph orch upgrade status
       - ceph health detail