Skip to content

updating RHCOS AMIs#19244

Merged
vikram-redhat merged 1 commit intoopenshift:masterfrom
kalexand-rh:rhcos_amis
Jan 23, 2020
Merged

updating RHCOS AMIs#19244
vikram-redhat merged 1 commit intoopenshift:masterfrom
kalexand-rh:rhcos_amis

Conversation

@kalexand-rh
Copy link
Copy Markdown
Contributor

@kalexand-rh kalexand-rh commented Jan 22, 2020

Trevor updated the AMIs on #18917, but it looks like they've shifted again.

Updates per current status of https://github.com/openshift/installer/blob/release-4.3/data/data/rhcos.json

@jianlinliu, will you PTAL?

@kalexand-rh kalexand-rh added this to the Future Release milestone Jan 22, 2020
@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 22, 2020
@openshift-docs-preview-bot
Copy link
Copy Markdown

openshift-docs-preview-bot commented Jan 22, 2020

The preview will be available shortly at:

@jianlinliu
Copy link
Copy Markdown

jianlinliu commented Jan 23, 2020

LGTM.

@vikram-redhat vikram-redhat merged commit 2f02849 into openshift:master Jan 23, 2020
@vikram-redhat
Copy link
Copy Markdown
Contributor

vikram-redhat commented Jan 23, 2020

/cherrypick enterprise-4.3

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Jan 23, 2020

@vikram-redhat: #19244 failed to apply on top of branch "enterprise-4.3":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	modules/installation-aws-user-infra-rhcos-ami.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-aws-user-infra-rhcos-ami.adoc
CONFLICT (content): Merge conflict in modules/installation-aws-user-infra-rhcos-ami.adoc
Patch failed at 0001 updating RHCOS AMIs
Details

In response to this:

/cherrypick enterprise-4.3

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.

vikram-redhat pushed a commit to vikram-redhat/openshift-docs that referenced this pull request Jan 23, 2020
@kalexand-rh
PR: openshift#19244
56d7252
vikram-redhat pushed a commit that referenced this pull request Jan 23, 2020
Merge pull request #19247 from vikram-redhat/enterprise-4.3
0453968 
[enterprise-4.3] PR: #19244
@yuvalk yuvalk mentioned this pull request Mar 18, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

branch/enterprise-4.3 size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

OCP 4.3 GA

Development

Successfully merging this pull request may close these issues.

6 participants

@kalexand-rh @openshift-docs-preview-bot @jianlinliu @vikram-redhat @openshift-cherrypick-robot @openshift-ci-robot