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.

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

NO-JIRA: common.yaml: disable composefs on all arches on el9 #1700

Merged
merged 1 commit into from
Dec 18, 2024
Merged

NO-JIRA: common.yaml: disable composefs on all arches on el9 #1700

merged 1 commit into from
Dec 18, 2024

Conversation

jlebon
Copy link
Member

@jlebon jlebon commented Dec 16, 2024 •
edited
Loading

There are issues currently on ppc64le and kernel-64k in el9 that break
with composefs. So it's not sufficient to do an architecture check
anyway. See: https://issues.redhat.com/browse/RHEL-63985.

The upcoming release of libostree will turn on composefs by default, so
it's not sufficient to delete prepare-root.conf; we need to explicitly
turn it off. See: ostreedev/ostree#3353.

@jlebon jlebon mentioned this pull request Dec 16, 2024
Open
@openshift-ci openshift-ci bot requested review from aaradhak and c4rt0 December 16, 2024 18:20
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 16, 2024
@jlebon jlebon force-pushed the pr/back-out-composefs branch from d9ae116 to 2a61323 Compare December 16, 2024 18:26
travier
travier approved these changes Dec 16, 2024
View reviewed changes
Copy link
Member

@travier travier left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 16, 2024
@jlebon
Copy link
Member Author

jlebon commented Dec 16, 2024

/retest-all

@jlebon
Copy link
Member Author

jlebon commented Dec 16, 2024

/retest

1 similar comment
@jlebon
Copy link
Member Author

jlebon commented Dec 17, 2024

/retest

@jlebon jlebon changed the title common.yaml: disable composefs on all arches NO-JIRA: common.yaml: disable composefs on all arches Dec 17, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 17, 2024
@openshift-ci-robot
Copy link

@jlebon: This pull request explicitly references no jira issue.

In response to this:

There are issues currently on ppc64le and kernel-64k in el9 that break with composefs. So it's not sufficient to do an architecture check anyway. See: https://issues.redhat.com/browse/RHEL-31991.

But additionally, there are issues also to resolve when dealing with old bootimages. This should be fixed by turning on composefs image generation by default in libostree and downgrading to maybe here. See: #1678.

Once we fix the latter issue, we should be able to turn it on at least in the el10 variants, where the first issue doesn't exist. (Though technically, even the latter issue is "fixed" in el10 by virtue of new enough libostree in the bootimages, but it would still break to go from an el9 bootimage to el10, which we'll likely have to support.)

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.

@c4rt0
Copy link
Contributor

c4rt0 commented Dec 17, 2024

/retest

c4rt0
c4rt0 approved these changes Dec 17, 2024
View reviewed changes
Copy link
Contributor

@c4rt0 c4rt0 left a comment

Choose a reason for hiding this comment

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

/lgtm

@c4rt0
Copy link
Contributor

c4rt0 commented Dec 17, 2024

/retest

1 similar comment
@c4rt0
Copy link
Contributor

c4rt0 commented Dec 17, 2024

/retest

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 643d8e7 and 2 for PR HEAD 2a61323 in total

@jlebon
Copy link
Member Author

jlebon commented Dec 17, 2024

/retest

2 similar comments
@Prashanth684
Copy link
Contributor

/retest

@jlebon
Copy link
Member Author

jlebon commented Dec 17, 2024

/retest

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 643d8e7 and 2 for PR HEAD 2a61323 in total

@c4rt0
Copy link
Contributor

c4rt0 commented Dec 17, 2024

/retest-required

@jlebon
common.yaml: disable composefs on all arches on el9
f775192 
There are issues currently on ppc64le and kernel-64k in el9 that break
with composefs. So it's not sufficient to do an architecture check
anyway. See: https://issues.redhat.com/browse/RHEL-63985.

The upcoming release of libostree will turn on composefs by default, so
it's not sufficient to delete `prepare-root.conf`; we need to explicitly
turn it off. See: ostreedev/ostree#3353.
@jlebon jlebon force-pushed the pr/back-out-composefs branch from 2a61323 to f775192 Compare December 18, 2024 17:04
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Dec 18, 2024
@jlebon
Copy link
Member Author

jlebon commented Dec 18, 2024

Now that ostreedev/ostree#3353 is coming, I removed the reference to the old bootimage issue and changed the code to instead disable it only on el9.

@openshift-ci-robot
Copy link

@jlebon: This pull request explicitly references no jira issue.

In response to this:

There are issues currently on ppc64le and kernel-64k in el9 that break
with composefs. So it's not sufficient to do an architecture check
anyway. See: https://issues.redhat.com/browse/RHEL-63985.

The upcoming release of libostree will turn on composefs by default, so
it's not sufficient to delete prepare-root.conf; we need to explicitly
turn it off. See: ostreedev/ostree#3353.

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.

@jlebon jlebon changed the title NO-JIRA: common.yaml: disable composefs on all arches NO-JIRA: common.yaml: disable composefs on all arches on el9 Dec 18, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Dec 18, 2024

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

@Prashanth684
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 18, 2024
dustymabe
dustymabe reviewed Dec 18, 2024
View reviewed changes
common.yaml
# https://issues.redhat.com/browse/RHEL-63985
if [ -f /usr/lib/ostree/prepare-root.conf ] && [[ $(rpm -q kernel) = *.el9.* ]]; then
grep -q 'enabled = true' /usr/lib/ostree/prepare-root.conf
sed -i -e 's,enabled = true,enabled = no,' /usr/lib/ostree/prepare-root.conf
Copy link
Member

Choose a reason for hiding this comment

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

feels a little weird to switch from one boolean set (true/false) to another (yes/no) here.

Copy link
Member

Choose a reason for hiding this comment

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

yes true, but no = false

dustymabe
dustymabe approved these changes Dec 18, 2024
View reviewed changes
Copy link
Member

@dustymabe dustymabe left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Dec 18, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: c4rt0, dustymabe, jlebon, Prashanth684, travier

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:
  • OWNERS [c4rt0,dustymabe,jlebon,travier]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit e8a7a75 into openshift:master Dec 18, 2024
11 checks passed
@jbtrystram jbtrystram mentioned this pull request Jan 21, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cgwalters cgwalters cgwalters left review comments

@dustymabe dustymabe dustymabe approved these changes

@c4rt0 c4rt0 c4rt0 approved these changes

@travier travier travier approved these changes

@aaradhak aaradhak Awaiting requested review from aaradhak

Assignees

@Prashanth684 Prashanth684

@dustymabe dustymabe

@c4rt0 c4rt0

@travier travier

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.
7 participants
@jlebon @openshift-ci-robot @c4rt0 @Prashanth684 @cgwalters @dustymabe @travier