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

ROX-20541: Temporarily exclude kernels 6.6 from build #1395

Merged
merged 3 commits into from
Oct 30, 2023

Conversation

ovalenti
Copy link
Contributor

Description

A patch was introduced to solve build issues on earlier RC versions of 6.6, which is now causing
build issues. It has been mostly reverted upstream.

Block temporarily those kernels while we work on pulling upstream.

Testing

This does not touch the Collector code, we just want to make the drivers build happy.

This issue has been fixed and the TODO statement
is misleading here.
@openshift-ci
Copy link

openshift-ci bot commented Oct 30, 2023

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

@ovalenti
Copy link
Contributor Author

@ovalenti ovalenti marked this pull request as ready for review October 30, 2023 16:33
@ovalenti ovalenti requested a review from a team as a code owner October 30, 2023 16:33
Copy link
Collaborator

@Molter73 Molter73 left a comment

Choose a reason for hiding this comment

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

LGTM!

~6\.[3-9]\.\d+.* ~2\.[2-5]\.\d+(?:-rc\d+)?
# TODO(ROX-20541) - 6.6 kernel compilation errors
6.6.* *
Copy link
Collaborator

Choose a reason for hiding this comment

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

You don't need the second parameter as a *, since the script that processes this file assumes all missing parts are *. https://github.com/stackrox/collector/blob/24b43e3f04594741fc92957662a4eae41bc53fdb/kernel-modules/build/apply-blocklist.py#L41C8-L41C8

Copy link
Contributor Author

Choose a reason for hiding this comment

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

And it is explained in the comment header... Removed it !

@ovalenti ovalenti merged commit 4c4dd4c into master Oct 30, 2023
34 checks passed
@ovalenti ovalenti deleted the ovalenti/block-6.6 branch October 30, 2023 17:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants