Skip to content

Wait until the image registry URL is propagated before doing e2e #2269

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
Nov 30, 2018
Merged

Wait until the image registry URL is propagated before doing e2e #2269

Show file tree
Hide file tree
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
9 changes: 9 additions & 0 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,15 @@ objects:
wait_expiry_ts="$(($(date +%s) + 90))"
done

# wait until the image registry changes propogate to the apiserver to avoid
# unnecessary restarts
until oc get is -n openshift php 2>/dev/null; do
sleep 10
done
until [[ -n "$( oc get is -n openshift php --template '{{ .status.dockerImageRepository }}' 2>/dev/null )" ]]; do
Copy link
Member

@wking wking Nov 30, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you drop the earlier until oc get ... and just use this loop? If you need to eat an exit code, maybe:

until [[ -n "$( oc get is -n openshift php --template '{{ .status.dockerImageRepository }}' 2>/dev/null || true)" ]]; do

On the other hand, this code will hopefully not live long, so no need to spend lots of time polishing ;).

sleep 10
done

# set up cloud-provider-specific env vars
if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
export GOOGLE_APPLICATION_CREDENTIALS="/tmp/cluster/gce.json"
Expand Down
9 changes: 9 additions & 0 deletions ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,15 @@ objects:
wait_expiry_ts="$(($(date +%s) + 90))"
done

# wait until the image registry changes propogate to the apiserver to avoid
# unnecessary restarts
until oc get is -n openshift php 2>/dev/null; do
sleep 10
done
until [[ -n "$( oc get is -n openshift php --template '{{ .status.dockerImageRepository }}' 2>/dev/null )" ]]; do
sleep 10
done

# set up cloud-provider-specific env vars
if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
export GOOGLE_APPLICATION_CREDENTIALS="/tmp/cluster/gce.json"
Expand Down