Skip to content

ci-operator/templates/openshift: Refactor router-rollout wait (again) #2321

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
Dec 10, 2018
Merged

ci-operator/templates/openshift: Refactor router-rollout wait (again) #2321

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
19 changes: 10 additions & 9 deletions ci-operator/templates/openshift/openshift-ansible/cluster-launch-e2e-40.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,16 +157,17 @@ objects:
break
done

i=0
MAX_RETRIES=10
wait_expiry_ts="$(($(date +%s) + 90))"
until oc --request-timeout=80s rollout status "${ROUTER_DEPLOYMENT}" -n "${ROUTER_NAMESPACE}" -w; do
i=$((i+1))
[ $i -eq $MAX_RETRIES ] && echo "timeout waiting for ${ROUTER_NAMESPACE}/${ROUTER_DEPLOYMENT} to be available" && exit 1
echo "error ${ROUTER_NAMESPACE}/${ROUTER_DEPLOYMENT} did not come up"
sleep "$((wait_expiry_ts - $(date +%s)))"
wait_expiry_ts="$(($(date +%s) + 90))"
TARGET="$(date -d '10 minutes' +%s)"
NOW="$(date +%s)"
while [[ "${NOW}" -lt "${TARGET}" ]]; do
REMAINING="$((TARGET - NOW))"
if oc --request-timeout="${REMAINING}s" rollout status "${ROUTER_DEPLOYMENT}" -n "${ROUTER_NAMESPACE}" -w; then
break
fi
sleep 2
NOW="$(date +%s)"
done
[[ "${NOW}" -ge "${TARGET}" ]] && echo "timeout waiting for ${ROUTER_NAMESPACE}/${ROUTER_DEPLOYMENT} to be available" && exit 1

# set up cloud-provider-specific env vars
if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
Expand Down