Skip to content
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

Merged
merged 1 commit into from
Jan 24, 2020

Conversation

sdodson
Copy link
Member

@sdodson sdodson commented Jan 23, 2020

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.

@openshift-ci-robot openshift-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 23, 2020
@sdodson
Copy link
Member Author

sdodson commented Jan 23, 2020

/test pj-rehearse

@sdodson
Copy link
Member Author

sdodson commented Jan 23, 2020

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.

@sdodson
Copy link
Member Author

sdodson commented Jan 23, 2020

/test pj-rehearse

@jstuever
Copy link
Contributor

/hold
Wait for e2e-aws-proxy success to prove it works.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 23, 2020
@jstuever
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 23, 2020
@@ -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)"
Copy link
Member

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.

@wking
Copy link
Member

wking commented Jan 23, 2020

This PR should address rhbz#1782063 spun off from #6248, but it will not address rhbz#1782062.

@sdodson sdodson changed the title aws/upi: Figure out AMI from rhcos.json Bug 1782063: aws/upi: Figure out AMI from rhcos.json Jan 23, 2020
@openshift-ci-robot
Copy link
Contributor

@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:

Bug 1782063: aws/upi: Figure out AMI from rhcos.json

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.

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Jan 23, 2020
@wking
Copy link
Member

wking commented Jan 23, 2020

/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 rhcos.json and that we won't have CI to catch us if that divergence breaks something. But we can only catch divergence-breakage on one branch now anyway, so maybe not a big deal.

@openshift-ci-robot openshift-ci-robot changed the title Bug 1782063: aws/upi: Figure out AMI from rhcos.json Bug 1782063: aws/upi: Figure out AMI from rhcos.json Jan 23, 2020
@sdodson
Copy link
Member Author

sdodson commented Jan 23, 2020

/test pj-rehearse

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jan 24, 2020
@openshift-ci-robot
Copy link
Contributor

New changes are detected. LGTM label has been removed.

@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 24, 2020
@sdodson
Copy link
Member Author

sdodson commented Jan 24, 2020

Added a commit to target the rehearsal better, will remove that and reapply lgtm after rehearsal.

@sdodson
Copy link
Member Author

sdodson commented Jan 24, 2020

e2e-aws-upi installation complete, i'll let the e2e tests complete but won't block merging this on success there.

@openshift-ci-robot openshift-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 24, 2020
@sdodson sdodson added lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 24, 2020
@sdodson
Copy link
Member Author

sdodson commented Jan 24, 2020

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 24, 2020
@openshift-ci-robot
Copy link
Contributor

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 06e9233 into openshift:master Jan 24, 2020
@openshift-ci-robot
Copy link
Contributor

@sdodson: All pull requests linked via external trackers have merged. Bugzilla bug 1782063 has been moved to the MODIFIED state.

In response to this:

Bug 1782063: aws/upi: Figure out AMI from rhcos.json

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.

@openshift-ci-robot
Copy link
Contributor

@sdodson: Updated the following 5 configmaps:

  • prow-job-cluster-launch-installer-upi-e2e configmap in namespace ci at cluster default using the following files:
    • key cluster-launch-installer-upi-e2e.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
  • prow-job-cluster-launch-installer-upi-e2e configmap in namespace ci-stg at cluster default using the following files:
    • key cluster-launch-installer-upi-e2e.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml
  • prow-job-cluster-launch-installer-upi-src configmap in namespace ci at cluster default using the following files:
    • key cluster-launch-installer-upi-src.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml
  • prow-job-cluster-launch-installer-upi-src configmap in namespace ci-stg at cluster default using the following files:
    • key cluster-launch-installer-upi-src.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-upi-src.yaml
  • prow-job-cluster-launch-installer-upi-e2e configmap in namespace ci at cluster ci/api-build01-ci-devcluster-openshift-com:6443 using the following files:
    • key cluster-launch-installer-upi-e2e.yaml using file ci-operator/templates/openshift/installer/cluster-launch-installer-upi-e2e.yaml

In response to this:

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.

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.

@openshift-ci-robot
Copy link
Contributor

@sdodson: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/rehearse/openshift/installer/master/e2e-aws-upi 59e4c87ccb36d0d3663d131fd35a913c20c6698d link /test pj-rehearse
ci/rehearse/openshift/installer/fcos/e2e-vsphere 156fe52 link /test pj-rehearse
ci/rehearse/openshift/installer/master/e2e-gcp-upi 156fe52 link /test pj-rehearse
ci/rehearse/openshift/installer/master/e2e-aws-proxy 156fe52 link /test pj-rehearse
ci/prow/pj-rehearse 156fe52 link /test pj-rehearse

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants