From 9f978ec6855e4bde7e92d1cc49445fc041726bb0 Mon Sep 17 00:00:00 2001 From: subhamkrai Date: Thu, 23 Apr 2026 13:18:55 +0530 Subject: [PATCH] ci: fix some minor canary test issues The canary test was waiting for replicapool instead of replicapool2, and a more reliable wait for the toolbox pod start is added. Signed-off-by: subhamkrai (cherry picked from commit b50f1a3d60f0b35eee61b9d81b566cee2dc0ffb6) --- .github/workflows/canary-integration-test.yml | 2 +- tests/scripts/github-action-helper.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/canary-integration-test.yml b/.github/workflows/canary-integration-test.yml index 75e410ad0..af93d951f 100644 --- a/.github/workflows/canary-integration-test.yml +++ b/.github/workflows/canary-integration-test.yml @@ -1685,7 +1685,7 @@ jobs: cd deploy/examples/ yq w -i pool-test.yaml metadata.name replicapool2 kubectl create -f pool-test.yaml - timeout 180 sh -c 'until [ "$(kubectl -n rook-ceph-secondary get cephblockpool replicapool -o jsonpath='{.status.phase}'|grep -c "Ready")" -eq 1 ]; do echo "waiting for pool replicapool2 to be created on cluster 2" && sleep 1; done' + timeout 180 sh -c 'until [ "$(kubectl -n rook-ceph-secondary get cephblockpool replicapool2 -o jsonpath='{.status.phase}'|grep -c "Ready")" -eq 1 ]; do echo "waiting for pool replicapool2 to be created on cluster 2" && sleep 1; done' - name: create images in the pools run: | diff --git a/tests/scripts/github-action-helper.sh b/tests/scripts/github-action-helper.sh index 4c7c59941..5299bf42b 100755 --- a/tests/scripts/github-action-helper.sh +++ b/tests/scripts/github-action-helper.sh @@ -320,7 +320,11 @@ function deploy_manifest_with_local_build() { function deploy_toolbox() { cd "${REPO_DIR}/deploy/examples" sed -i 's/image: quay\.io\/ceph\/ceph:.*/image: quay.io\/ceph\/ceph:v18/' toolbox.yaml + local ns + ns=$(yq r toolbox.yaml metadata.namespace 2>/dev/null) + timeout 300 bash -c 'until kubectl get secret rook-ceph-mon -n "$1" &>/dev/null && kubectl get cm rook-ceph-mon-endpoints -n "$1" &>/dev/null; do sleep 2; done' _ "${ns}" kubectl create -f toolbox.yaml + kubectl -n "${ns}" wait --for=condition=available deployment/rook-ceph-tools --timeout=300s } function replace_ceph_image() {