Add AWS CLI to UPI image. #3292
Conversation
|
/test e2e-aws-upi |
1 similar comment
|
/test e2e-aws-upi |
|
/retest |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: abhinavdahiya The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci-robot
added
the
approved
|
/retest Please review the full test history for this PR and help us cut down flakes. |
2 similar comments
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
3 similar comments
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
Add the AWS CLI to the UPI image for use in the upi templates (which install the cli through pip) and the VSphere IPI template. These commands are the same as used by the OpenStack Dockerfile.
patrickdillon
force-pushed
the
upi-image-awscli
branch
from
71b0c30
to
665ba44
Compare
|
@abhinavdahiya rebased. Needs refreshed lgtm. |
|
/lgtm |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
2 similar comments
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
11 similar comments
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/test e2e-aws-upi |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
3 similar comments
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
@patrickdillon: The following tests failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. 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. I understand the commands that are listed here. |
We need both 'oc' and 'aws' for this script. The upi-installer image has a complicated history with the 'aws' command: * openshift/installer@512f93dd30 (images/installer: add image that can be used to instal UPI platforms, 2019-03-22, master and release-4.0, openshift/installer#1456) added the epel-release and awscli RPMs. * openshift/installer@c7b7863b42 (image: remove unneeded packages, 2019-08-13, master and release-4.2, openshift/installer#2206) removed the epel-release and awscli RPMs, which were no longer avialable. * openshift/installer@665ba44f45 (Add AWS CLI to UPI image, 2020-03-13, master and release-4.5, openshift/installer#3292) installed 'aws' via curl. But that means that today the bundled upi-installer has no 'aws' for 4.4 and earlier, leading to errors like [1]: Gathering console logs for i-04151362d551668fe /bin/bash: line 39: aws: command not found error: failed to execute wrapped command: exit status 1 2020/06/18 23:52:50 Container test in pod e2e-aws-gather-aws-console failed, exit code 1, reason Error on 4.2. With this commit I reference the 4.5 image [2,3], because that has the commands I need, and we don't need anything that's particularly senstive to the command versions. [1]: https://deck-ci.apps.ci.l2s4.p1.openshiftapps.com/view/gcs/origin-ci-test/pr-logs/pull/openshift_cluster-version-operator/382/pull-ci-openshift-cluster-version-operator-release-4.2-e2e-aws/1273733457419177984 [2]: https://github.com/openshift/ci-tools/blob/97d72735a969f11b210806970d523f1b63297905/pkg/webreg/webreg.go#L933-L946 [3]: https://github.com/openshift/ci-tools/blob/97d72735a969f11b210806970d523f1b63297905/pkg/webreg/webreg.go#L1267-L1279
…occur We are pinning the deprovision image due to openshift/installer#3292 Since we no longer deprovision as part of gather-proxy, we can remove the pinning of that image.
…4: Return to 4.4 upi-installer 9b76797 (adding periodic proxy test using new workflow, 2020-07-15, openshift#10150) pulled in the 4.5 upi-installer for 4.4 CI because the the 'aws' client is new in 4.5 [1]. But it caused problems in UPI jobs, because steps consuming the upi-installer image ended up getting the 4.5 version and pulling 4.5 RHCOS [2]: 2020-09-02 13:52:16+00:00 - Locating RHCOS image for release... 2020-09-02 13:52:16+00:00 - Configuring govc exports... 2020-09-02 13:52:16+00:00 - Checking if RHCOS OVA needs to be downloaded from https://releases-art-rhcos.svc.ci.openshift.org/art/storage/releases/rhcos-4.5/45.82.202008010929-0/x86_64/rhcos-45.82.202008010929-0-vmware.x86_64.ova... However, the proxy jobs are currently explicitly pulling the 4.5 image straight from the ocp namespace: $ git grep -B3 'tag: upi-installer' ci-operator/step-registry | grep proxy ci-operator/step-registry/ipi/conf/aws/proxy/ipi-conf-aws-proxy-ref.yaml- from_image: ci-operator/step-registry/ipi/conf/aws/proxy/ipi-conf-aws-proxy-ref.yaml- namespace: ocp ci-operator/step-registry/ipi/conf/aws/proxy/ipi-conf-aws-proxy-ref.yaml- name: "4.5" ci-operator/step-registry/ipi/conf/aws/proxy/ipi-conf-aws-proxy-ref.yaml: tag: upi-installer ci-operator/step-registry/ipi/deprovision/proxy/ipi-deprovision-proxy-ref.yaml- from_image: ci-operator/step-registry/ipi/deprovision/proxy/ipi-deprovision-proxy-ref.yaml- namespace: ocp ci-operator/step-registry/ipi/deprovision/proxy/ipi-deprovision-proxy-ref.yaml- name: "4.5" ci-operator/step-registry/ipi/deprovision/proxy/ipi-deprovision-proxy-ref.yaml: tag: upi-installer So they shouldn't care about any upi-installer business in the release config file. Moving back to 4.4 there should fix the UPI portions of the jobs without breaking the proxy steps. I'm not clear if we can entirely drop upi-installer from base_images or not, so I'm leaving it alone for now. [1]: openshift/installer#3292 [2]: https://storage.googleapis.com/origin-ci-test/logs/periodic-ci-openshift-release-master-ocp-4.4-e2e-vsphere-upi/1301151427015479296/artifacts/e2e-vsphere-upi/upi-conf-vsphere-ova/container-logs/test.log
Add the AWS CLI to the UPI image for use in the upi templates (which install the cli through pip) and the VSphere IPI template. These commands are the same as used by the OpenStack Dockerfile.
/test e2e-aws-upi