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

MCO-392: Start using rhel-coreos image rather than machine-os-content. #142

Merged
merged 1 commit into from
Mar 18, 2024

Conversation

ybettan
Copy link
Member

@ybettan ybettan commented Feb 8, 2024

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: #101
/cc @jlebon

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 8, 2024
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Feb 8, 2024

@ybettan: 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 either version "4.16." or "openshift-4.16.", but it targets "4.15.0" instead.

In response to this:

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: #101
/cc @jlebon

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested a review from jlebon February 8, 2024 08:39
@ybettan
Copy link
Member Author

ybettan commented Feb 8, 2024

/hold
Should be merged together with openshift/release#48526

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 8, 2024
Copy link

openshift-ci bot commented Feb 8, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 8, 2024
@ybettan ybettan force-pushed the machine-os-content branch from 8351e93 to c788a32 Compare February 8, 2024 08:47
@jlebon
Copy link
Member

jlebon commented Feb 8, 2024

Thanks for opening this!

/hold
Should be merged together with openshift/release#48526

It's not necessary they go together. openshift/release#48526 should be able to go in alone. Once we confirm everything still works fine, and we're confident there's nothing else relying on it, then we can coordinate on flipping over again DTK, RHCOS and ART together.

@ybettan
Copy link
Member Author

ybettan commented Feb 11, 2024

It's not necessary they go together. openshift/release#48526 should be able to go in alone. Once we confirm everything still works fine, and we're confident there's nothing else relying on it, then we can coordinate on flipping over again DTK, RHCOS and ART together.

Ack. I am not sure what openshift/release#48526 really does but in DTK we are referencing to the machine-os-content labels for the driver-toolkit imagestream in the cluster (which is used by KMM to build kmods in cluster).

Anyway, I will keep it on hold until we have the ART+RHCOS+DTK parts together.
Thanks for the update.

@jlebon
Copy link
Member

jlebon commented Mar 7, 2024

OK, we're looking good now. openshift/kubernetes references have been removed.
I've re-staged the openshift/os change in openshift/os#1457.
Let's target early next week to get these in? Will reach out more directly for coordinating.

@ybettan
Copy link
Member Author

ybettan commented Mar 11, 2024

/retest

@ybettan
Copy link
Member Author

ybettan commented Mar 13, 2024

/override ci/prow/images
/override ci/prow/e2e-aws
/override ci/prow/e2e-aws-driver-toolkit-presubmit
/override ci/prow/e2e-upgrade

Copy link

openshift-ci bot commented Mar 13, 2024

@ybettan: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

  • ci/prow/e2e-aws-driver-toolkit-presubmit

Only the following failed contexts/checkruns were expected:

  • ci/prow/check-commits-count
  • ci/prow/e2e-aws
  • ci/prow/e2e-upgrade
  • ci/prow/images
  • ci/prow/verify
  • ci/prow/verify-image-content
  • pull-ci-openshift-driver-toolkit-master-check-commits-count
  • pull-ci-openshift-driver-toolkit-master-e2e-aws
  • pull-ci-openshift-driver-toolkit-master-e2e-upgrade
  • pull-ci-openshift-driver-toolkit-master-images
  • pull-ci-openshift-driver-toolkit-master-verify
  • pull-ci-openshift-driver-toolkit-master-verify-image-content
  • tide

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:

/override ci/prow/images
/override ci/prow/e2e-aws
/override ci/prow/e2e-aws-driver-toolkit-presubmit
/override ci/prow/e2e-upgrade

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

ybettan commented Mar 13, 2024

/hold

@ybettan
Copy link
Member Author

ybettan commented Mar 13, 2024

/override ci/prow/images

@yevgeny-shnaidman
Copy link

/lgtm

Copy link

openshift-ci bot commented Mar 13, 2024

@ybettan: Overrode contexts on behalf of ybettan: ci/prow/images

In response to this:

/override ci/prow/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.

@ybettan
Copy link
Member Author

ybettan commented Mar 13, 2024

/override ci/prow/e2e-aws

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 13, 2024
Copy link

openshift-ci bot commented Mar 13, 2024

@ybettan: Overrode contexts on behalf of ybettan: ci/prow/e2e-aws

In response to this:

/override ci/prow/e2e-aws

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

ybettan commented Mar 14, 2024

/override ci/prow/e2e-upgrade

Copy link

openshift-ci bot commented Mar 14, 2024

@ybettan: Overrode contexts on behalf of ybettan: ci/prow/e2e-upgrade

In response to this:

/override ci/prow/e2e-upgrade

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.

@@ -15,7 +15,7 @@ spec:
from:
kind: DockerImage
name: example.com/image-reference-placeholder:driver-toolkit
- name: 0.0.1-snapshot-machine-os
- name: 0.0.1-snapshot-rhel-coreos
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure this change is required? IIUC, machine-os is a reference to whatever image has the machine-os component name, i.e. these kinds of labels:

"io.openshift.build.version-display-names": "machine-os=CentOS Stream CoreOS",
"io.openshift.build.versions": "machine-os=416.94.202403121338-0",

And that'll correctly refer to the new rhel-coreos image once openshift/os#1457 is in.

(The previous stab at this didn't change this and IIRC I don't think we hit issues related to that in the brief period where we had flipped all the switches.)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you are right. I have reverted this part.

@ybettan ybettan force-pushed the machine-os-content branch from c788a32 to c42ae6e Compare March 18, 2024 11:06
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 18, 2024
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.

Signed-off-by: Yoni Bettan <[email protected]>
Co-authored-by: Jonathan Lebon <[email protected]>
@yevgeny-shnaidman
Copy link

/lgtm

@ybettan
Copy link
Member Author

ybettan commented Mar 18, 2024

/override ci/prow/e2e-aws

@ybettan
Copy link
Member Author

ybettan commented Mar 18, 2024

/override ci/prow/e2e-aws-driver-toolkit-presubmit ci/prow/e2e-upgrade

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 18, 2024
Copy link

openshift-ci bot commented Mar 18, 2024

@ybettan: Overrode contexts on behalf of ybettan: ci/prow/e2e-aws

In response to this:

/override ci/prow/e2e-aws

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.

Copy link

openshift-ci bot commented Mar 18, 2024

@ybettan: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

  • ci/prow/e2e-aws-driver-toolkit-presubmit

Only the following failed contexts/checkruns were expected:

  • ci/prow/check-commits-count
  • ci/prow/e2e-aws
  • ci/prow/e2e-upgrade
  • ci/prow/images
  • ci/prow/verify
  • ci/prow/verify-image-content
  • pull-ci-openshift-driver-toolkit-master-check-commits-count
  • pull-ci-openshift-driver-toolkit-master-e2e-aws
  • pull-ci-openshift-driver-toolkit-master-e2e-upgrade
  • pull-ci-openshift-driver-toolkit-master-images
  • pull-ci-openshift-driver-toolkit-master-verify
  • pull-ci-openshift-driver-toolkit-master-verify-image-content
  • tide

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:

/override ci/prow/e2e-aws-driver-toolkit-presubmit ci/prow/e2e-upgrade

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

ybettan commented Mar 18, 2024

/override ci/prow/e2e-aws-driver-toolkit-presubmit

@ybettan
Copy link
Member Author

ybettan commented Mar 18, 2024

/override ci/prow/e2e-upgrade

Copy link

openshift-ci bot commented Mar 18, 2024

@ybettan: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

  • ci/prow/e2e-aws-driver-toolkit-presubmit

Only the following failed contexts/checkruns were expected:

  • ci/prow/check-commits-count
  • ci/prow/e2e-aws
  • ci/prow/e2e-upgrade
  • ci/prow/images
  • ci/prow/verify
  • ci/prow/verify-image-content
  • pull-ci-openshift-driver-toolkit-master-check-commits-count
  • pull-ci-openshift-driver-toolkit-master-e2e-aws
  • pull-ci-openshift-driver-toolkit-master-e2e-upgrade
  • pull-ci-openshift-driver-toolkit-master-images
  • pull-ci-openshift-driver-toolkit-master-verify
  • pull-ci-openshift-driver-toolkit-master-verify-image-content
  • tide

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:

/override ci/prow/e2e-aws-driver-toolkit-presubmit

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.

Copy link

openshift-ci bot commented Mar 18, 2024

@ybettan: Overrode contexts on behalf of ybettan: ci/prow/e2e-upgrade

In response to this:

/override ci/prow/e2e-upgrade

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

ybettan commented Mar 18, 2024

/override ci/prow/images

@ybettan
Copy link
Member Author

ybettan commented Mar 18, 2024

/unhold

Copy link

openshift-ci bot commented Mar 18, 2024

@ybettan: Overrode contexts on behalf of ybettan: ci/prow/images

In response to this:

/override ci/prow/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 openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 18, 2024
Copy link

openshift-ci bot commented Mar 18, 2024

@ybettan: 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.

@ybettan
Copy link
Member Author

ybettan commented Mar 18, 2024

/label acknowledge-critical-fixes-only

@openshift-ci openshift-ci bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Mar 18, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 142ddc0 into openshift:master Mar 18, 2024
7 checks passed
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build driver-toolkit-container-v4.16.0-202403181742.p0.g142ddc0.assembly.stream.el9 for distgit driver-toolkit.
All builds following this will include this PR.

@ybettan ybettan deleted the machine-os-content branch June 3, 2024 15:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Please drop machine-os-content reference
5 participants