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 1818140: Backport adding groundwork for multi-arch images #3233

Merged
merged 8 commits into from
Mar 27, 2020
Merged

Bug 1818140: Backport adding groundwork for multi-arch images #3233

merged 8 commits into from
Mar 27, 2020

Conversation

Prashanth684
Copy link
Contributor

A backport of #2885 and backport of one commit from #2933 - which is to enable s390x boot image support.

List of commits which are being backported:
2583ba4
8428471
b1726d2
b7d7474

/cc @crawford @jaypoulz

@openshift-ci-robot
Copy link
Contributor

@Prashanth684: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[release-4.3]: Backport adding groundwork for multi-arch images

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 size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Mar 4, 2020
@Prashanth684
Copy link
Contributor Author

/assign @wking

@crawford
Copy link
Contributor

crawford commented Mar 5, 2020

I don't see the s390x image variants. Is that intentional?

I want to double check the amd64 variants as well.

/hold

@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 Mar 5, 2020
@Prashanth684
Copy link
Contributor Author

I don't see the s390x image variants. Is that intentional?

I want to double check the amd64 variants as well.

/hold

Yes. the 4.3 s390x images need to be put in releases-art-rhcos.svc.ci.openshift.org and they are not present as of yet. I was thinking of putting that in another PR. The amd64 variants are the exact same as the ones in rhcos.json.

@crawford
Copy link
Contributor

crawford commented Mar 5, 2020

/hold cancel
/retest

Can you drop that last commit (enabling s390x as a valid platform) until we have the build metadata?

@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 Mar 5, 2020
@Prashanth684
Copy link
Contributor Author

/hold cancel
/retest

Can you drop that last commit (enabling s390x as a valid platform) until we have the build metadata?

I added the build metadata for s390x. I was just not aware that the URL used for getting the metadata was a public version of the internal URL.

@crawford
Copy link
Contributor

crawford commented Mar 5, 2020

@miabbott is the RHCOS team comfortable with this version being used for s390x?

@Prashanth684 does the QEMU variant of this image use the config-drive or do we need a similar hack to the one we used in 4.2?

@Prashanth684
Copy link
Contributor Author

@miabbott is the RHCOS team comfortable with this version being used for s390x?

@Prashanth684 does the QEMU variant of this image use the config-drive or do we need a similar hack to the one we used in 4.2?

we need coreos/ignition#905 (or something similar) for the QEMU variant to use config drive

@crawford
Copy link
Contributor

crawford commented Mar 5, 2020

we need coreos/ignition#905 (or something similar) for the QEMU variant to use config drive

Okay, let's hold this PR for now. We'll need to get a fix into the OS and then update the build metadata. Same goes for ppc64.

/hold

@openshift-ci-robot openshift-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Mar 5, 2020
@miabbott
Copy link
Member

@miabbott is the RHCOS team comfortable with this version being used for s390x?

Comparing the s390x and ppc64le versions noted in this PR, it looks like they roughly line up with version 43.81.202003021026.0 from the x86_64 pipeline.

But the s390x and ppc64le versions have a slighty different content set; I'd say the s390x version should be 43.81.202003091812.0 to have better alignment across arches.

Of course, this is moot if we need a fix to Ignition and have to respin everything anyways...

@Prashanth684
Copy link
Contributor Author

@miabbott is the RHCOS team comfortable with this version being used for s390x?

Comparing the s390x and ppc64le versions noted in this PR, it looks like they roughly line up with version 43.81.202003021026.0 from the x86_64 pipeline.

But the s390x and ppc64le versions have a slighty different content set; I'd say the s390x version should be 43.81.202003091812.0 to have better alignment across arches.

Of course, this is moot if we need a fix to Ignition and have to respin everything anyways...

exactly. i am waiting for coreos/ignition#905 to merge and then re-spin ignition for 4.3.

@Prashanth684 Prashanth684 force-pushed the 4.3-multiarch-images branch from 5385cea to 0bdcc34 Compare March 18, 2020 16:59
crawford added 2 commits March 18, 2020 13:13
@crawford @Prashanth684
*: add support for multi-arch rhcos image lookup
63e7882 
This adds an architecture parameter to the RHCOS image lookup process
and a corresponding field to MachinePool. This is a backward-compatible
change, defaulting the architecture to AMD64 if none has been specified.
This also enforces that the control plane and compute nodes share an
architecture, since we don't support heterogeneous clusters today.

(cherry picked from commit 2583ba4)
@crawford @Prashanth684
hack: improve portability of bootimage script
be27b94 
Not everyone has python3 installed into /usr/bin/.

(cherry picked from commit 8428471)
@Prashanth684 Prashanth684 force-pushed the 4.3-multiarch-images branch from 0bdcc34 to a36ffdb Compare March 18, 2020 17:15
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 18, 2020
crawford and others added 4 commits March 18, 2020 13:22
@crawford @Prashanth684
hack: update format of rhcos build metadata
84d91bc 
This splits the RHCOS build metadata into architecture-specific files.
This will allow the metadata to contain information about bootimages of
multiple architectures. In order to preserve backward compatibility
(there are a few users, including certain CI jobs, that pull rhcos.json
from GitHub directly), I've opted to use separate files for each
architecture. Normally, we could have just symlinked the legacy metadata
file, but when hosted on raw.githubcontent.com, the symlinks aren't
followed.

When updating the RHCOS bootimages, this script will need to be run once
for each architecture that is being updated.

(cherry picked from commit b1726d2)
@crawford @Prashanth684
*: enable s390x bootimage support
a7dc41c 
(cherry picked from commit b7d7474)
@Prashanth684
add buildmetadata for s390x
77dfa33 
Similar to commit openshift@b1381e5 for 4.2

This was generated by:
./hack/update-rhcos-bootimage.py https://releases-art-rhcos.svc.ci.openshift.org/art/storage/releases/rhcos-4.3-s390x/43.81.202003172338.0/s390x/meta.json s390x
@Prashanth684
add buildmetadata for ppc64le
84608d9 
Similar to previous commit, add metadata for ppc64le which is a supported arch 4.3 onwards.

This was generated by:
./hack/update-rhcos-bootimage.py https://releases-art-rhcos.svc.ci.openshift.org/art/storage/releases/rhcos-4.3-ppc64le/43.81.202003172241.0/ppc64le/meta.json ppc64le
@Prashanth684 Prashanth684 force-pushed the 4.3-multiarch-images branch from a36ffdb to 84608d9 Compare March 18, 2020 17:23
@Prashanth684
Copy link
Contributor Author

@crawford @miabbott updated PR with latest bootimage for s390x and ppc64le which includes support in ignition for coreos/ignition#936

@miabbott
Copy link
Member

The versions for s390x and ppc64le look good to me; they have the updated ignition and a fixed version of iptables, too.

The versions roughly align with 43.81.202003172344.0 from the x86_64 pipeline; that version (and newer) have been consumed by the OCP CI machines already and no errors have been reported.

/approve

@Prashanth684
Bump terraform libvirt provider
791f248 
Bump terraform libvirt provider to use the openshift/terraform-provider-libvirt multi_arch branch which has the support for
fetching ignition for s390x and ppc64le. The multi_arch branch is based on the 40b0cda5333a29dd9f33d1cfdc206bfad3a8af96 commit of
the provider and just adds - dmacvicar/terraform-provider-libvirt#718
@Prashanth684
Copy link
Contributor Author

@crawford bumped terraform with the latest commit. We have all that we need. Should be good to go.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Mar 27, 2020 •
edited
Loading

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

Test name Commit Details Rerun command
ci/prow/e2e-gcp-upi d27e3d7 link /test e2e-gcp-upi
ci/prow/e2e-azure d27e3d7 link /test e2e-azure

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.

@crawford
Copy link
Contributor

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 27, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: crawford, miabbott

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 Mar 27, 2020
@Prashanth684
Copy link
Contributor Author

/retitle Bug 1818140: [release-4.3]: Backport adding groundwork for multi-arch images

@openshift-ci-robot openshift-ci-robot changed the title [release-4.3]: Backport adding groundwork for multi-arch images Bug 1818140: [release-4.3]: Backport adding groundwork for multi-arch images Mar 27, 2020
@openshift-ci-robot
Copy link
Contributor

@Prashanth684: This pull request references Bugzilla bug 1818140, which is invalid:

  • expected dependent Bugzilla bug 1818139 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is POST 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 1818140: [release-4.3]: Backport adding groundwork for multi-arch images

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/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Mar 27, 2020
@Prashanth684
Copy link
Contributor Author

/bugzilla refresh

@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 Mar 27, 2020
@openshift-ci-robot
Copy link
Contributor

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

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.3.z) matches configured target release for branch (4.3.z)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1818139 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1818139 targets the "4.4.0" release, matching the expected (4.4.0) release
  • bug has dependents

In response to this:

/bugzilla refresh

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 removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Mar 27, 2020
@crawford crawford changed the title Bug 1818140: [release-4.3]: Backport adding groundwork for multi-arch images Bug 1818140: Backport adding groundwork for multi-arch images Mar 27, 2020
@crawford
Copy link
Contributor

/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 Mar 27, 2020
@openshift-bot
Copy link
Contributor

/retest

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

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

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

@jwforres jwforres added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 27, 2020
@openshift-merge-robot openshift-merge-robot merged commit 0a7f198 into openshift:release-4.3 Mar 27, 2020
@openshift-ci-robot
Copy link
Contributor

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

In response to this:

Bug 1818140: Backport adding groundwork for multi-arch images

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
@crawford crawford mentioned this pull request May 1, 2020
Merged
@wking wking mentioned this pull request May 7, 2020
Merged
@Prashanth684 Prashanth684 deleted the 4.3-multiarch-images branch February 12, 2021 14:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@crawford crawford Awaiting requested review from crawford

@jaypoulz jaypoulz Awaiting requested review from jaypoulz

Assignees

@wking wking

@crawford crawford

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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@Prashanth684 @openshift-ci-robot @crawford @miabbott @openshift-bot @wking @jwforres @openshift-merge-robot