diff --git a/.github/workflows/canary-integration-test.yml b/.github/workflows/canary-integration-test.yml index fcf041694..d99631c84 100644 --- a/.github/workflows/canary-integration-test.yml +++ b/.github/workflows/canary-integration-test.yml @@ -903,9 +903,6 @@ jobs: timeout 120 bash -c 'while kubectl -n rook-ceph get cephobjectstore my-store; do echo "waiting for objectstore my-store to delete"; sleep 5; done' kubectl create -f tests/manifests/test-object.yaml tests/scripts/validate_cluster.sh rgw - # the test is already waiting for the rgw daemon to start, but this is just a hack until we find - # what else we need to wait for - sleep 30 tests/scripts/deploy-validate-vault.sh validate_rgw - name: collect common logs diff --git a/tests/scripts/validate_cluster.sh b/tests/scripts/validate_cluster.sh index 702c1d689..fa2b3a749 100755 --- a/tests/scripts/validate_cluster.sh +++ b/tests/scripts/validate_cluster.sh @@ -62,8 +62,12 @@ function test_demo_osd { } function test_demo_rgw { - # shellcheck disable=SC2046 - return $(wait_for_daemon "$EXEC_COMMAND -s | grep -sq 'rgw:'") + timeout 360 bash -x <<-'EOF' + until [[ "$(kubectl -n rook-ceph get pods -l app=rook-ceph-rgw -o 'jsonpath={..status.conditions[?(@.type=="Ready")].status}')" == "True" ]]; do + echo "waiting for rgw pods to be ready" + sleep 5 + done +EOF } function test_demo_mds {