Skip to content

ci-operator/templates/openshift: Use IMAGE_TESTS for teardown gzip #2911

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
Feb 26, 2019
Merged

ci-operator/templates/openshift: Use IMAGE_TESTS for teardown gzip #2911

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
7 changes: 3 additions & 4 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 @@ -115,8 +115,6 @@ objects:
trap 'touch /tmp/shared/exit' EXIT
trap 'kill $(jobs -p); exit 0' TERM

cp "$(which oc)" /tmp/shared/

mkdir -p "${HOME}"

# wait for the API to come up
Expand Down Expand Up @@ -241,6 +239,7 @@ objects:
trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit; fi; exit "${rc}"' EXIT
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM

cp "$(command -v openshift-install)" /tmp
mkdir /tmp/artifacts/installer &&
/bin/openshift-install version >/tmp/artifacts/installer/version

Expand Down Expand Up @@ -303,12 +302,12 @@ objects:
exit 1
fi

TF_LOG=debug /bin/openshift-install --dir=/tmp/artifacts/installer create cluster &
TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create cluster &
wait "$!"

# Performs cleanup of all created resources
- name: teardown
image: ${IMAGE_INSTALLER}
image: ${IMAGE_TESTS}
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- name: shared-tmp
Expand Down
7 changes: 5 additions & 2 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 @@ -18,6 +18,8 @@ parameters:
required: true
- name: IMAGE_FORMAT
required: true
- name: IMAGE_TESTS
required: true
- name: CLUSTER_TYPE
required: true
# Ensures the release image is created and tested
Expand Down Expand Up @@ -211,6 +213,7 @@ objects:
trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit; fi; exit "${rc}"' EXIT
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM

cp "$(command -v openshift-install)" /tmp
mkdir /tmp/artifacts/installer &&
/bin/openshift-install version >/tmp/artifacts/installer/version

Expand Down Expand Up @@ -273,12 +276,12 @@ objects:
exit 1
fi

TF_LOG=debug /bin/openshift-install --dir=/tmp/artifacts/installer create cluster &
TF_LOG=debug openshift-install --dir=/tmp/artifacts/installer create cluster &
wait "$!"

# Performs cleanup of all created resources
- name: teardown
image: ${IMAGE_INSTALLER}
image: ${IMAGE_TESTS}
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- name: shared-tmp
Expand Down
7 changes: 4 additions & 3 deletions ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ objects:
trap 'touch /tmp/shared/exit' EXIT
trap 'kill $(jobs -p); exit 0' TERM

cp "$(which oc)" /tmp/shared/
cp "$(command -v oc)" /tmp/shared/

mkdir -p "${HOME}"

Expand Down Expand Up @@ -304,6 +304,7 @@ objects:
trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit; fi; exit "${rc}"' EXIT
trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM

cp "$(command -v openshift-install)" /tmp
mkdir /tmp/artifacts/installer &&
/bin/openshift-install version >/tmp/artifacts/installer/version

Expand Down Expand Up @@ -366,7 +367,7 @@ objects:
exit 1
fi

/bin/openshift-install --dir=/tmp/artifacts/installer create cluster --log-level=debug &
openshift-install --dir=/tmp/artifacts/installer create cluster --log-level=debug &
wait "$!"

# Runs scale up playbook
Expand Down Expand Up @@ -411,7 +412,7 @@ objects:

# Performs cleanup of all created resources
- name: teardown
image: ${IMAGE_INSTALLER}
image: ${IMAGE_TESTS}
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- name: shared-tmp
Expand Down