Skip to content

e2e-pool: Smarter wait_for_pool_to_be_ready #1534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Sep 10, 2021
Merged

e2e-pool: Smarter wait_for_pool_to_be_ready #1534

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions hack/e2e-pool-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ trap cleanup EXIT
function wait_for_pool_to_be_ready() {
local poolname=$1
local i=0
while [[ $(oc get clusterpool $poolname -o json | jq '.status.ready == .status.size') != "true" ]]; do
# NOTE: This will need to change if we add a test with a zero-size pool.
while [[ $(oc get clusterpool $poolname -o json | jq '.status.size != 0 and .status.ready == .status.size') != "true" ]]; do
i=$((i+1))
if [[ $i -gt $max_cluster_deployment_status_checks ]]; then
echo "Timed out waiting for clusterpool $poolname to be ready."
Expand Down Expand Up @@ -139,9 +140,6 @@ FAKE_POOL_NAME=fake-pool
oc get clusterpool ${REAL_POOL_NAME} -o json \
| jq '.spec.annotations["hive.openshift.io/fake-cluster"] = "true" | .metadata.name = "'${FAKE_POOL_NAME}'" | .spec.size = 4' \
| oc apply -f -
# We can get spurious ready==size for a little while
# TODO: something better than sleep
sleep 5
wait_for_pool_to_be_ready $FAKE_POOL_NAME

# Test stale cluster replacement (HIVE-1058)
Expand Down