test: improve reliability of canary rgw-multisite-testing

Signed-off-by: Joshua Hoblitt <josh@hoblitt.com>
(cherry picked from commit 92d9f994c2)

.github/workflows/canary-integration-test.yml

@@ -1549,8 +1549,8 @@ jobs:
         run: |
           tests/scripts/github-action-helper.sh deploy_first_rook_cluster
           kubectl create -f deploy/examples/object-multisite-test.yaml
-          # wait for multisite store to be created
-          tests/scripts/github-action-helper.sh wait_for_rgw rook-ceph
+          # wait for multisite-store to be created
+          tests/scripts/github-action-helper.sh wait_for cephobjectstore multisite-store rook-ceph 480
 
       - name: prep second cluster pull realm config
         shell: bash --noprofile --norc -eo pipefail -x {0}
@@ -1569,13 +1569,13 @@ jobs:
           tests/scripts/github-action-helper.sh deploy_second_rook_cluster
           kubectl create -f deploy/examples/object-multisite-pull-realm-test.yaml
           # wait for realms to be pulled and zone-b-multisite-store to be created
-          tests/scripts/github-action-helper.sh wait_for_rgw rook-ceph-secondary
+          tests/scripts/github-action-helper.sh wait_for cephobjectstore zone-b-multisite-store rook-ceph-secondary 480
 
-      - name: wait for ceph cluster 1 to be ready
+      - name: wait for both ceph clusters to be ready
         shell: bash --noprofile --norc -eo pipefail -x {0}
         run: |
-          tests/scripts/validate_cluster.sh osd 1
-          kubectl -n rook-ceph get pods
+          tests/scripts/github-action-helper.sh wait_for cephcluster my-cluster rook-ceph
+          tests/scripts/github-action-helper.sh wait_for cephcluster my-cluster rook-ceph-secondary
 
       - name: write an object to one cluster, read from the other
         shell: bash --noprofile --norc -eo pipefail -x {0}