-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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.
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
Bug 1782063: aws/upi: Figure out AMI from rhcos.json #6835
Conversation
/test pj-rehearse |
e2e-aws-proxy job made it through installation at least, i need to verify that job actually uses my changes though since all upi jobs are interleaved in one file. |
/test pj-rehearse |
/hold |
/lgtm |
@@ -1195,8 +1195,7 @@ objects: | |||
|
|||
# begin bootstrapping | |||
if [[ "${CLUSTER_TYPE}" == "aws" ]]; then | |||
# Derived from https://github.com/openshift/installer/blob/93c78d09ed9e2badb4bf5dab708152fe6b3b6602/data/data/rhcos.json#L40 | |||
RHCOS_AMI=ami-0aea6a5be0fc2b3fc # FIXME: assumes AWS_REGION is us-east-1 | |||
RHCOS_AMI="$(jq -r .amis[\"${AWS_REGION}\"].hvm /var/lib/openshift-install/rhcos.json)" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd have expected:
RHCOS_AMI="$(jq -r ".amis[\"${AWS_REGION}\"].hvm" /var/lib/openshift-install/rhcos.json)"
(with additional quoting around the jq
expression) but this seems to work as you have it as well.
This PR should address rhbz#1782063 spun off from #6248, but it will not address rhbz#1782062. |
@sdodson: This pull request references Bugzilla bug 1782063, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker. In 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. |
/retitle Bug 1782063: aws/upi: Figure out AMI from rhcos.json Also, this means that the openshift-docs hard-coded list may diverge from whatever we have in |
/test pj-rehearse |
New changes are detected. LGTM label has been removed. |
Added a commit to target the rehearsal better, will remove that and reapply lgtm after rehearsal. |
e2e-aws-upi installation complete, i'll let the e2e tests complete but won't block merging this on success there. |
/hold cancel |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jstuever, sdodson 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 |
@sdodson: All pull requests linked via external trackers have merged. Bugzilla bug 1782063 has been moved to the MODIFIED state. In 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. |
@sdodson: Updated the following 5 configmaps:
In 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. |
@sdodson: 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. |
This will need to account for arch specific rhcos.json in the future but other jobs use this file already so we're at least uniform.