Skip to content

Commit

Permalink
ci-operator/templates/openshift/installer: Drop unnecessary copy of i…
Browse files Browse the repository at this point in the history 
…nstaller to shared volume

I started doing this in 00d7b3f (ci-operator/templates/openshift:
Use IMAGE_TESTS for teardown gzip, 2019-02-19, #2911), but the
teardown container doesn't need an installer injected if it running an
installer image.

  $ git grep -A1 'name: teardown' ci-operator/templates/openshift/installer | grep image:
  ci-operator/templates/openshift/installer/cluster-launch-installer-custom-test-image.yaml-      image: ${IMAGE_TESTS}
  ci-operator/templates/openshift/installer/cluster-launch-installer-e2e.yaml-      image: ${IMAGE_TESTS}
  ci-operator/templates/openshift/installer/cluster-launch-installer-libvirt-e2e.yaml-      image: ${IMAGE_LIBVIRT_INSTALLER}
  ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml-      image: ${IMAGE_UPI_INSTALLER}
  ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml-      image: ${IMAGE_OPENSTACK_INSTALLER}
  ci-operator/templates/openshift/installer/cluster-launch-installer-remote-libvirt-e2e.yaml-      image: "${IMAGE_LIBVIRT_INSTALLER}"
  ci-operator/templates/openshift/installer/cluster-launch-installer-src.yaml-      image: ${IMAGE_TESTS}
  ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml-      image: ${IMAGE_UPI_INSTALLER}
  ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml-      image: ${IMAGE_UPI_INSTALLER}

So this commit removes the openshift-installer copy from the templates
that use installer images, and leaves it for templates that use test
images.
  • Loading branch information
@wking
wking committed Feb 7, 2020
1 parent 08e865e commit 169227b
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 7 deletions.
1 change: 0 additions & 1 deletion ci-operator/templates/openshift/installer/cluster-launch-installer-metal-e2e.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@ objects:
trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit /tmp/setup-failed; 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
if [[ -n "${INSTALL_INITIAL_RELEASE}" && -n "${RELEASE_IMAGE_INITIAL}" ]]; then
Expand Down
1 change: 0 additions & 1 deletion ci-operator/templates/openshift/installer/cluster-launch-installer-openstack-e2e.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,6 @@ objects:
trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit /tmp/setup-failed; 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
# We have to truncate cluster name to 14 chars, because there is a limitation in the install-config
Expand Down
1 change: 0 additions & 1 deletion ci-operator/templates/openshift/installer/cluster-launch-installer-ovirt-e2e.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,6 @@ objects:
fi
# poll to make sure that the test container has dropped oc into the shared volume
while [ ! command -V oc ]; do sleep 1; done
cp "$(command -v openshift-install)" /tmp
mkdir /tmp/artifacts/installer
source /tmp/ovirt-lease.conf
source /etc/openshift-installer/ovirt.conf
Expand Down
1 change: 0 additions & 1 deletion ci-operator/templates/openshift/installer/cluster-launch-installer-remote-libvirt-e2e.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,6 @@ 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
if [[ -n "${INSTALL_INITIAL_RELEASE}" && -n "${RELEASE_IMAGE_INITIAL}" ]]; then
Expand Down
1 change: 0 additions & 1 deletion ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1000,7 +1000,6 @@ objects:
EOF
}
cp "$(command -v openshift-install)" /tmp
mkdir /tmp/artifacts/installer
if [[ -n "${INSTALL_INITIAL_RELEASE}" && -n "${RELEASE_IMAGE_INITIAL}" ]]; then
Expand Down
1 change: 0 additions & 1 deletion ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,6 @@ objects:
return 1
}
cp "$(command -v openshift-install)" /tmp
mkdir /tmp/artifacts/installer
if [[ -n "${INSTALL_INITIAL_RELEASE}" && -n "${RELEASE_IMAGE_INITIAL}" ]]; then
Expand Down
1 change: 0 additions & 1 deletion ci-operator/templates/openshift/openshift-ansible/cluster-scaleup-e2e-40.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,6 @@ objects:
trap 'rc=$?; if test "${rc}" -eq 0; then touch /tmp/setup-success; else touch /tmp/exit /tmp/setup-failed; 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
if [[ -n "${INSTALL_INITIAL_RELEASE}" && -n "${RELEASE_IMAGE_INITIAL}" ]]; then
Expand Down

0 comments on commit 169227b

Please sign in to comment.