Skip to content

USHIFT-5352: Use EUS bootc base images and prevent unintended OS version upgrade #4531

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
Merged
merged 7 commits into from
Feb 12, 2025
Merged

USHIFT-5352: Use EUS bootc base images and prevent unintended OS version upgrade #4531

merged 7 commits into from
Feb 12, 2025

Conversation

ggiguash
Copy link
Contributor

No description provided.

@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 10, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 10, 2025 •
edited by openshift-ci bot
Loading

@ggiguash: This pull request references USHIFT-5352 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 bug to target the "4.19.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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 10, 2025
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Feb 10, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 10, 2025
@ggiguash ggiguash changed the title USHIFT-5352: Bootc OS optimizations: use EUS base images and prevent unintended OS version upgrade USHIFT-5352: Use EUS bootc base images and prevent unintended OS version upgrade Feb 10, 2025
@ggiguash ggiguash marked this pull request as ready for review February 10, 2025 18:10
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 10, 2025
@openshift-ci openshift-ci bot requested review from copejon and dhensel-rh February 10, 2025 18:11
@ggiguash
Copy link
Contributor Author

Transient subscription management issues

+ 12:19:06.792586087 ./scripts/devenv-builder/configure-vm.sh:128 	sudo subscription-manager release --set 9.4
Remote server error. Please check the connection details, or see /var/log/rhsm/rhsm.log for more information.

/test e2e-aws-tests-bootc
/test e2e-aws-tests

@ggiguash
Copy link
Contributor Author

/cherry-pick release-4.18

@openshift-cherrypick-robot
Copy link

@ggiguash: once the present PR merges, I will cherry-pick it on top of release-4.18 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.18

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-sigs/prow repository.

pmtk
pmtk reviewed Feb 12, 2025
View reviewed changes
packaging/imagemode/Containerfile.repobase
@@ -9,6 +9,8 @@ FROM ${BASE_IMAGE_URL}:${BASE_IMAGE_TAG}

ARG DNF_OPTIONS

# Do not run 'dnf upgrade' command to avoid overrides of the base
# images specified by the container image build pipelines.
Copy link
Member

Choose a reason for hiding this comment

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

Is this the best advice we can give? Are those images rebuilt daily so we don't need to upgrade the packages?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's not an advice, this is a requirement that comes from the ART pipelines. They are responsible for selecting the base image.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It goes back to the comment in the beginning of this Containerfile. It's crafted for ART pipeline requirements.

Copy link
Member

Choose a reason for hiding this comment

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

Ack, I didn't see the comment at the top of the file, so I assumed this is an example for the user (just like the blueprint example in release-info rpm)

@pmtk
Copy link
Member

pmtk commented Feb 12, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 12, 2025
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Feb 12, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ggiguash, pmtk

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

openshift-ci bot commented Feb 12, 2025

@ggiguash: 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-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit c3d2883 into openshift:main Feb 12, 2025
14 checks passed
@openshift-cherrypick-robot
Copy link

@ggiguash: #4531 failed to apply on top of branch "release-4.18":

Applying: Switch RHEL bootc base image to EUS in tests
Applying: Update image mode docs to use RHEL EUS image and dnf upgrade
Using index info to reconstruct a base tree...
M	docs/config/Containerfile.bootc-rhel9
M	docs/contributor/image_mode.md
Falling back to patching base and 3-way merge...
Auto-merging docs/contributor/image_mode.md
CONFLICT (content): Merge conflict in docs/contributor/image_mode.md
Auto-merging docs/config/Containerfile.bootc-rhel9
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0002 Update image mode docs to use RHEL EUS image and dnf upgrade

In response to this:

/cherry-pick release-4.18

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-sigs/prow repository.

@ggiguash ggiguash deleted the prevent_unintended_bootc_os_upgrades branch February 12, 2025 16:51
@ggiguash ggiguash mentioned this pull request Feb 12, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@copejon copejon Awaiting requested review from copejon

@dhensel-rh dhensel-rh Awaiting requested review from dhensel-rh

1 more reviewer

@pmtk pmtk pmtk left review comments

Reviewers whose approvals may not affect merge requirements
Assignees

@pmtk pmtk

Labels
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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ggiguash @openshift-ci-robot @openshift-cherrypick-robot @pmtk