qa/suites/rados/cephadm/upgrade: wait for rgw servicemap entries to refresh

rgw changed the way it registered in the service map.  Wait a bit for
the old entries to be flushed out.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 3f3d955b19a1dcadbe8137b32eb695e8be6b496a)

diff --git a/qa/suites/rados/cephadm/upgrade/4-wait.yaml b/qa/suites/rados/cephadm/upgrade/4-wait.yaml
index e14aabff5f085504df8ebf7095ca9e72b7427025..e71143dafe43b189f086e175dd3a357b39201b53 100644 (file)
--- a/qa/suites/rados/cephadm/upgrade/4-wait.yaml
+++ b/qa/suites/rados/cephadm/upgrade/4-wait.yaml
@@ -5,5 +5,9 @@ tasks:
       - while ceph orch upgrade status | jq '.in_progress' | grep true ; do ceph orch ps ; ceph versions ; sleep 30 ; done
       - ceph orch ps
       - ceph versions
+      - echo "wait for servicemap items w/ changing names to refresh"
+      - sleep 60
+      - ceph orch ps
+      - ceph versions
       - ceph versions | jq -e '.overall | length == 1'
       - ceph versions | jq -e '.overall | keys' | grep $sha1