diff options
| author | Adam King <adking@redhat.com> | 2024-08-27 23:24:44 +0200 |
|---|---|---|
| committer | Adam King <adking@redhat.com> | 2024-09-23 17:31:04 +0200 |
| commit | b9f63e12572c34fdc617dc8c12339051ae829bde (patch) | |
| tree | e16eedc195c5f254cbf76379cc64668fe7e183d3 /qa/suites/orch | |
| parent | Merge pull request #54334 from adk3798/cephadm-iscsi-teuth-extension (diff) | |
| download | ceph-b9f63e12572c34fdc617dc8c12339051ae829bde.tar.xz ceph-b9f63e12572c34fdc617dc8c12339051ae829bde.zip | |
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 <adking@redhat.com>
Diffstat (limited to 'qa/suites/orch')
| -rw-r--r-- | qa/suites/orch/cephadm/upgrade/3-upgrade/staggered.yaml | 4 |
1 files changed, 3 insertions, 1 deletions
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 |