Revert "Re-enable ostree-container-inject-openshift-cvo-labels knob"
#1393
Conversation
This reverts commit 12a9a69. There are more references to machine-os-content in https://github.com/openshift/kubernetes/blob/master/openshift-hack/images/os/Dockerfile and https://github.com/openshift/release/blob/master/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml that need to be removed first before we can try this again.
openshift-ci
bot
added
the
approved
…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.
|
/hold I think all we need is openshift/release#45669 actually. Internal Slack thread: https://redhat-internal.slack.com/archives/CB95J6R4N/p1699972589082549 |
openshift-ci
bot
added
the
do-not-merge/hold
|
/hold cancel We're going to temporarily revert while we work on removing the final references in o/k. |
openshift-ci
bot
removed
the
do-not-merge/hold
|
Manually adding labels to get o/k unstuck. |
soltysh
added
jira/valid-reference
|
/lgtm |
|
/retest |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jlebon, travier The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
CI here only does local QEMU tests and doesn't really test this PR in a meaningful way. So let's just merge it in to get o/k fixed faster. |
|
@jlebon: Overrode contexts on behalf of jlebon: ci/prow/rhcos-92-build-test-qemu, ci/prow/scos-9-build-test-qemu DetailsIn 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. DetailsInstructions 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` (#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.
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!
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!
3 participants
This reverts commit 12a9a69.
There are more references to machine-os-content in
https://github.com/openshift/kubernetes/blob/master/openshift-hack/images/os/Dockerfile
and
https://github.com/openshift/release/blob/master/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml
that need to be removed first before we can try this again.