MCO-392: Start using rhel-coreos image rather than machine-os-content
#135
Conversation
The `machine-os-content` is deprecated and we'd like to stop shipping it entirely in the release payload. Point the DTK imagestream to the `rhel- coreos` image instead. Closes: openshift#101
openshift-ci
bot
added
the
do-not-merge/work-in-progress
|
Skipping CI for Draft Pull Request. |
|
This would go at the same time as openshift/os#1374. |
|
Thanks for this PR @jlebon. Is openshift/os#1374 adding the "io.openshift.build.versions": "machine-os=.." label to the Do we need anything else to make it propagate into the payload or it is happening automatically. If that's all we need I am good with merging. |
|
/approve |
openshift-ci
bot
added
the
approved
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jlebon, travier, ybettan 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 |
|
This will require stopping driver-toolkit image mirroring first, as the release controller will otherwise barf when there's an unknown image (rhel-coreos does not exist in OKD imagestreams): openshift/release#43816 |
|
Also note that the |
Opened openshift/installer#7636! |
|
@LorbusChris Do we need anything else before undrafting this PR and merging it? |
We were waiting on ART bits to catch up, but looks like we might be there. Discussions in openshift-eng/ocp-build-data#3851. |
|
Great. /hold |
openshift-ci
bot
added
the
do-not-merge/hold
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
|
OK as expected, CI is failing with: So I think we're ready here to merge them all together! openshift/os#1374 is ready to merge, so if you agree and override the CI failures to get this in, I'll get that one in too. |
jlebon
changed the title
rhel-coreos image rather than machine-os-contentrhel-coreos image rather than machine-os-content
openshift-ci-robot
added
the
jira/valid-reference
|
@jlebon: This pull request references MCO-392 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.15.0" version, but no target version was set. In response to this:
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. |
|
Actually, we went ahead and merged openshift/os#1374. This should be good to go too now! |
|
ART bits are merged too |
|
/retest |
|
/unhold |
openshift-ci
bot
removed
the
do-not-merge/hold
|
Will we actually be able to achieve green CI here or do we have to force merge it? I do see we have an RHCOS build now with openshift/os#1374 (415.92.202311082221-0). It was pushed as quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12ff620fd1eebe68c006cbe0b971ed570a0d304c5992048b898c6be176dad6eb. But I'm not familiar enough with OpenShift CI internals to know if that'll end up in the right place on its own for CI to pick it up here or if e.g. it'll fail to get there anyway until this PR is forced in. |
BTW, I can confirm that image has the expected labels: |
|
/retest rhel-coreos image updated for CI |
|
/retest |
|
/override ci/prow/e2e-aws |
|
/override ci/prow/images |
|
@ybettan: /override requires failed status contexts, check run or a prowjob name to operate on.
Only the following failed contexts/checkruns were expected:
If you are trying to override a checkrun that has a space in it, you must put a double quote on the context. In response to this:
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. |
|
@ybettan: Overrode contexts on behalf of ybettan: ci/prow/images In response to this:
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. |
|
/override ci/prow/e2e-aws |
|
@ybettan: Overrode contexts on behalf of ybettan: ci/prow/e2e-aws, ci/prow/e2e-aws-driver-toolkit-presubmit, ci/prow/e2e-upgrade In response to this:
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. |
|
@jlebon: 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. |
…nt` (openshift#135)" This reverts commit 86bbea7. We need to revert the openshift/os side of this because of remaining references to machine-os-content: openshift/os#1393 So we have to revert this too.
|
[ART PR BUILD NOTIFIER] This PR has been included in build driver-toolkit-container-v4.15.0-202311150309.p0.g86bbea7.assembly.stream for distgit driver-toolkit. |
…nt` (#135)" (#136) This reverts commit 86bbea7. We need to revert the openshift/os side of this because of remaining references to machine-os-content: openshift/os#1393 So we have to revert this too.
The
machine-os-contentis deprecated and we'd like to stop shipping it entirely in the release payload. Point the DTK imagestream to therhel-coreosimage instead.Closes: #101