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

Revert "image*.yaml: Enable injection of OCP machine-os metadata by… #1084

Merged

Conversation

cgwalters
Copy link
Member

… default"

This reverts commit f4646dc.

We're seeing failures here because as of right now the machine-os-content and rhel-coreos-8 are not aliases; and even if they were it appears that oc would need work to handle this.

… default"

This reverts commit f4646dc.

We're seeing failures here because as of right now the `machine-os-content`
and `rhel-coreos-8` are not aliases; and even if they were it appears
that `oc` would need work to handle this.
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 7, 2022
@jlebon
Copy link
Member

jlebon commented Dec 7, 2022

Does this imply ART will not be adding the new oscontainer to the release payload for now? Is there something we can link to here with more info on the failures? There's a lot of moving pieces around this so it'd be good to keep a good paper trail.

@cgwalters
Copy link
Member Author

Status quo is that we have both old and new container image in the release image.

@jlebon
Copy link
Member

jlebon commented Dec 7, 2022

Status quo is that we have both old and new container image in the release image.

OK. I asked because I thought the tooling required those labels to be in place but it seems like that's not the case.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 7, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 7, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, jlebon

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
Copy link

/retest-required

Remaining retests: 0 against base HEAD 89f0eeb and 2 for PR HEAD 11ad8c7 in total

@cgwalters
Copy link
Member Author

/override ci/prow/rhcos-86-build-test-qemu
Not sure what failed there, but this can't break it.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 8, 2022

@cgwalters: Overrode contexts on behalf of cgwalters: ci/prow/rhcos-86-build-test-qemu

In response to this:

/override ci/prow/rhcos-86-build-test-qemu
Not sure what failed there, but this can't break it.

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.

@travier
Copy link
Member

travier commented Dec 8, 2022

/override ci/prow/scos-9-build-test-qemu
SCOS is failing on something else.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 8, 2022

@travier: Overrode contexts on behalf of travier: ci/prow/scos-9-build-test-qemu

In response to this:

/override ci/prow/scos-9-build-test-qemu
SCOS is failing on something else.

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
Copy link
Contributor

openshift-ci bot commented Dec 8, 2022

@cgwalters: all tests passed!

Full PR test history. Your PR dashboard.

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.

@openshift-merge-robot openshift-merge-robot merged commit b25d766 into openshift:master Dec 8, 2022
@travier travier mentioned this pull request Jan 26, 2023
jlebon added a commit to jlebon/os that referenced this pull request Sep 27, 2023
This was previously enabled (openshift#1048) and then disabled again (openshift#1084)
because `oc` doesn't know how to handle multiple images with those
labels in the release payload. We'll need to solve this eventually if
we want to be able to ship multiple OS images in the payload (that's
tracked in openshift#1047), but we don't need to block on this if we can remove
the legacy `machine-os-content` at the same time.

See also: openshift/driver-toolkit#101
See also: openshift/machine-config-operator#3364
jlebon added a commit to jlebon/os that referenced this pull request Sep 27, 2023
This was previously enabled (openshift#1048) and then disabled again (openshift#1084)
because `oc` doesn't know how to handle multiple images with those
labels in the release payload. We'll need to solve this eventually if
we want to be able to ship multiple OS images in the payload (that's
tracked in openshift#1047), but we don't need to block on this if we can remove
the legacy `machine-os-content` at the same time.

See also: openshift/driver-toolkit#101
See also: openshift/machine-config-operator#3364
jlebon added a commit to jlebon/os that referenced this pull request Mar 7, 2024
This was previously enabled (openshift#1048, openshift#1374) and then disabled again (openshift#1084, openshift#1393).

The last time we tried it, the issue was that there were some references
remaining in openshift/kubernetes and openshift/release. Those have been
cleaned up now:

openshift/release#49156
openshift/kubernetes#1805

So... third time's the charm!
jlebon added a commit to jlebon/os that referenced this pull request Mar 7, 2024
This was previously enabled (openshift#1048, openshift#1374) and then disabled again (openshift#1084, openshift#1393).

The last time we tried it, the issue was that there were some references
remaining in openshift/kubernetes and openshift/release. Those have been
cleaned up now:

openshift/release#49156
openshift/kubernetes#1805

So... third time's the charm!
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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants