ci-operator/templates/openshift: Use IMAGE_TESTS for teardown gzip #2911
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci-robot
added
the
do-not-merge/hold
openshift-ci-robot
added
the
size/S
Member
Author
|
We can lift the hold if/when openshift/origin#22094 lands adding |
openshift-ci-robot
added
the
needs-rebase
Member
Author
Landed. CC @sdodson /hold cancel |
openshift-ci-robot
removed
the
do-not-merge/hold
The teardown container requires oc (for retrieving cluster logs), gzip (for compressing those logs), and openshift-install (for destroying the cluster). We were already copying in oc from another container; with this commit we copy in the statically-linked openshift-install too. That leaves gzip, which we will be built in to IMAGE_TESTS as "a command needed in the CI-test context". Using IMAGE_TESTS for teardown means we no longer need to copy oc into the shared volume for the teardown container (although we may need to copy it in for other containers, e.g. the src template's test container). I've also dropped an unnecessary /bin/ prefix from the 'create cluster' invocations, which we'd been dragging around from the pre-shell days of 3f2f01c (ci-operator/config/openshift/installer/master: Move to openshift-install, 2018-09-26, openshift#1677).
wking
force-pushed
the
copy-installer-to-teardown
branch
from
545f4ce to
00d7b3f
Compare
openshift-ci-robot
removed
the
needs-rebase
Member
Author
Member
|
/lgtm |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: sdodson, wking The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci-robot
added
the
approved
Contributor
|
@wking: Updated the following 6 configmaps:
DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
wking
added a commit
to wking/openshift-installer
that referenced
this pull request
Mar 4, 2019
… gzip" This reverts commit 71d199c, openshift#1262 Since openshift/release@00d7b3f31 (ci-operator/templates/openshift: Use IMAGE_TESTS for teardown gzip, 2019-02-19, openshift/release#2911), the release repository no longer users the installer image for the teardown containers.
wking
added a commit
to wking/openshift-release
that referenced
this pull request
Feb 7, 2020
…nstaller to shared volume I started doing this in 00d7b3f (ci-operator/templates/openshift: Use IMAGE_TESTS for teardown gzip, 2019-02-19, openshift#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.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The teardown container requires
oc(for retrieving cluster logs),gzip(for compressing those logs), andopenshift-install(for destroying the cluster). We were already copying inocfrom another container; with this commit we copy in the statically-linkedopenshift-installtoo. That leavesgzip, which we will be built in toIMAGE_TESTSas "a command needed in the CI-test context". UsingIMAGE_TESTSfor teardown means we no longer need to copyocinto the shared volume for the teardown container (although we may need to copy it in for other containers, e.g. the src template's test container).I've also dropped an unnecessary
/bin/prefix from thecreate clusterinvocations, which we'd been dragging around from the pre-shell days of 3f2f01c (#1677).This will allow us to walk back openshift/installer#1262, but we'll still need
gzipin the tests image./hold