From c73f8c4ed582ee3d5fded0b3f6bff7200b2a30c8 Mon Sep 17 00:00:00 2001 From: Adam King Date: Tue, 27 Aug 2024 17:24:44 -0400 Subject: [PATCH] qa/cephadm: wait a bit before checking rgw daemons upgraded w/ `ceph versions` As this seems to take a little bit to be updated and the tests end up failing despite the rgw daemons actually being upgraded successfully Fixes: https://tracker.ceph.com/issues/67758 Signed-off-by: Adam King (cherry picked from commit b9f63e12572c34fdc617dc8c12339051ae829bde) --- qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml b/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml index 0080d3bf730..c6bec082843 100644 --- a/qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml +++ b/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 -- 2.39.5