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.

Sign up for GitHub

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

Jump to bottom

Bug 1824172: enable ppc64le & s390x bootimage support #3455

Merged
merged 7 commits into from May 8, 2020
Merged

Bug 1824172: enable ppc64le & s390x bootimage support #3455

merged 7 commits into from May 8, 2020

Conversation

andymcc
Copy link
Member

@andymcc andymcc commented Apr 15, 2020 •
edited by crawford

This is a port of the 2 PRs:

b7d7474
d27e3d7

@andymcc andymcc changed the title *: enable ppc64le & s390x bootimage support Bug 1824172: enable ppc64le & s390x bootimage support Apr 15, 2020
@openshift-ci-robot openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Apr 15, 2020
@openshift-ci-robot
Copy link
Contributor

@andymcc: This pull request references Bugzilla bug 1824172, which is invalid:

  • expected the bug to target the "4.5.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1824172: enable ppc64le & s390x bootimage support

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.

@andymcc andymcc changed the title Bug 1824172: enable ppc64le & s390x bootimage support Bug 1824173: enable ppc64le & s390x bootimage support Apr 15, 2020
@openshift-ci-robot
Copy link
Contributor

@andymcc: This pull request references Bugzilla bug 1824173, which is invalid:

  • expected the bug to target the "4.5.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1824173: enable ppc64le & s390x bootimage support

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.

@andymcc andymcc changed the title Bug 1824173: enable ppc64le & s390x bootimage support Bug 1824172: enable ppc64le & s390x bootimage support Apr 15, 2020
@openshift-ci-robot
Copy link
Contributor

@andymcc: This pull request references Bugzilla bug 1824172, which is invalid:

  • expected the bug to target the "4.5.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1824172: enable ppc64le & s390x bootimage support

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.

@andymcc andymcc mentioned this pull request Apr 15, 2020
Merged
@openshift-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Apr 15, 2020
@openshift-ci-robot
Copy link
Contributor

@andymcc: This pull request references Bugzilla bug 1824172, 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.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.5.0) matches configured target release for branch (4.5.0)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1824172: enable ppc64le & s390x bootimage support

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.

@crawford
Copy link
Contributor

This is missing changes to rhcos.json.

/hold

Are any of the other commits from the original PRs needed?

@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 Apr 15, 2020
@andymcc
Copy link
Member Author

andymcc commented Apr 15, 2020

@crawford for 4.5+ we'll need to rework the terraform libvirt provider PR ( 791f248 ) - otherwise that should be it, as far as we know. The rhcos.json images are not ready for 4.5 on s390x just yet thats why they aren't included here.
My aim was to get the machinery required to make those files and the other required PRs in to master so they can then be backported cleanly to 4.4 - but if you'd prefer we can hold off on 4.5+ and just focus on 4.4, until we have everything ready and do 1 big PR including all the other commits when the time comes?

@andymcc
Copy link
Member Author

andymcc commented Apr 15, 2020

I've fixed up the backports properly - and added the rhcos file for ppc64le. We could hold this until the 4.5 for s390x are building and do it in 1 go.
I'll also be working on the terraform libvirt fix which is the last change i believe required.

@andymcc andymcc force-pushed the master branch 2 times, most recently from e73532b to 7c40d04 Compare April 24, 2020 09:51
@Prashanth684
Copy link
Contributor

/test e2e-libvirt

@Prashanth684
Copy link
Contributor

/test e2e-aws

@andymcc
vendor: update terraform-provider-libvirt to 0.6.2
c5726a4 
Version 0.6.2 includes a fix for injecting ignition config required by
both s390x and ppc64le architectures.
@andymcc
add buildmetadata for s390x
a8a48b4 
Metadata generated by:
./hack/update-rhcos-bootimage.py https://releases-art-rhcos.svc.ci.openshift.org/art/storage/releases/rhcos-4.5-s390x/45.81.202005020555-0/s390x/meta.json s390x
@andymcc
add buildmetadata for ppc64le
b11dca0 
Metadata generated by:
./hack/update-rhcos-bootimage.py https://releases-art-rhcos.svc.ci.openshift.org/art/storage/releases/rhcos-4.5-ppc64le/45.81.202005020554-0/ppc64le/meta.json ppc64le
@Prashanth684
Copy link
Contributor

@crawford can the hold be removed on this. the rhcos images are included and all tests passed.

@wking
Copy link
Member

wking commented May 7, 2020

Trying to understand the forward-picks from #2933 and #3233, I see:

@wking
Copy link
Member

wking commented May 7, 2020

Ah, 4.3's 84608d9 was split in this PR, feeding both b11dca0 and 25e0be9.

nit: commit message for 25e0be9 has "(cherry picked from commit 28fb0bd)", but should probably be talking about 84608d9, because 28fb0bd is not a commit from any production installer branch or PR.

@wking
Copy link
Member

wking commented May 7, 2020

I'm a bit fuzzy on vendor bumps, but all the other commits look good to me, and @crawford's concerns have been addressed.

/lgtm
/approve
/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 May 7, 2020
@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 7, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: wking

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-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 7, 2020
@Prashanth684
Copy link
Contributor

Prashanth684 commented May 7, 2020 •
edited

Ah, 4.3's 84608d9 was split in this PR, feeding both b11dca0 and 25e0be9.

nit: commit message for 25e0be9 has "(cherry picked from commit 28fb0bd)", but should probably be talking about 84608d9, because 28fb0bd is not a commit from any production installer branch or PR.

Yes 4.3 did not have any of the initial commits for the bootimage support whereas 4.4 already had it (as it was master at the time @crawford 's initial PR landed). So what was needed for 4.4 was the addition of the rhcos images and the terraform bump. The rhcos images were done only for 4.2 initially because we did not have any multiarch rhcos images 4.3 and beyond

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit fca0338 into openshift:master May 8, 2020
@openshift-ci-robot
Copy link
Contributor

@andymcc: All pull requests linked via external trackers have merged: openshift/installer#3455. Bugzilla bug 1824172 has been moved to the MODIFIED state.

In response to this:

Bug 1824172: enable ppc64le & s390x bootimage support

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jcpowermac jcpowermac Awaiting requested review from jcpowermac

@mtnbikenc mtnbikenc Awaiting requested review from mtnbikenc

Assignees

@wking wking

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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@andymcc @openshift-ci-robot @crawford @Prashanth684 @wking @openshift-bot @openshift-merge-robot