Skip to content

Commit

Permalink
Merge pull request openshift-metal3#783 from russellb/check-worker-ci
Browse files Browse the repository at this point in the history
Update CI to wait for a worker to come up.
  • Loading branch information
stbenjam authored Aug 29, 2019
2 parents d7597f8 + 8c19ee4 commit c5c69f8
Showing 1 changed file with 9 additions and 14 deletions.
23 changes: 9 additions & 14 deletions run_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -147,20 +147,15 @@ timeout -s 9 85m make |& ts "%b %d %H:%M:%S | " |& sed -e 's/.*auths.*/*** PULL_
# Deployment is complete, but now wait to ensure the worker node comes up.
export KUBECONFIG=ocp/auth/kubeconfig

# TODO -
# We do not expect a worker to come up right now, as the machine-api-operator
# managed metal3 deployment is known to be failing. We also do the deployment
# only configured with 3 masters and 0 workers. We'll need to update this to
# scale the worker machine set up to 1 here.
#wait_for_worker() {
# worker=$1
# echo "Waiting for worker $worker to appear ..."
# while [ "$(oc get nodes | grep $worker)" = "" ]; do sleep 5; done
# TIMEOUT_MINUTES=15
# echo "$worker registered, waiting $TIMEOUT_MINUTES minutes for Ready condition ..."
# oc wait node/$worker --for=condition=Ready --timeout=$[${TIMEOUT_MINUTES} * 60]s
#}
#wait_for_worker worker-0
wait_for_worker() {
worker=$1
echo "Waiting for worker $worker to appear ..."
while [ "$(oc get nodes | grep $worker)" = "" ]; do sleep 5; done
TIMEOUT_MINUTES=15
echo "$worker registered, waiting $TIMEOUT_MINUTES minutes for Ready condition ..."
oc wait node/$worker --for=condition=Ready --timeout=$[${TIMEOUT_MINUTES} * 60]s
}
wait_for_worker worker-0

# Populate cache for files it doesn't have, or that have changed
for FILE in $FILESTOCACHE ; do
Expand Down

0 comments on commit c5c69f8

Please sign in to comment.