Skip to content

ROX-26604: Backport lineage fix to ACS 4.6.x (Scanner 2.35.x) #1766

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

Merged
merged 6 commits into from
Jan 16, 2025

Conversation

dcaravel
Copy link
Contributor

@dcaravel dcaravel commented Jan 14, 2025

Adds the lineage fix for RHEL images to the Scanner 2.35 branch (targeting ACS 4.6.x).

Backports the lineage fix:

And other 'CI' fixes:

git cherry-pick 111f6f5acb4cadb5c2201fc0a3f84e134bc2e6a8
git cherry-pick ceec7298652d0d8bed7d18bc1080dd6a9e9fe24c
git cherry-pick 71cbd4bfd96a3971024f408cbe6c43b7f392a7cd
git cherry-pick 7be1bc087fff57c40987d4834edf5eae02bff515
git cherry-pick 83e994bb7331c046695e1408f90d16a910ee6432
git cherry-pick 1a50ad032b6502fb4d521d912147c10c3c4050f2

@dcaravel
Copy link
Contributor Author

/retest

@RTann
Copy link
Collaborator

RTann commented Jan 15, 2025

let me cherry-pick some changes to help CI pass

@RTann
Copy link
Collaborator

RTann commented Jan 15, 2025

@dcaravel can you rebase?

@dcaravel dcaravel force-pushed the dc/backport-lineage-fix branch from c41b822 to 1cee815 Compare January 15, 2025 18:54
@dcaravel
Copy link
Contributor Author

@dcaravel can you rebase?

Done - let's see how it goes...

@dcaravel dcaravel added the generate-dumps-on-pr Generates the image based on dumps from the PR label Jan 16, 2025
Copy link

openshift-ci bot commented Jan 16, 2025

@dcaravel: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-tests 04174d0 link false /test e2e-tests

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.

@RTann RTann mentioned this pull request Jan 16, 2025
@dcaravel dcaravel merged commit d4480c3 into release-2.35 Jan 16, 2025
30 of 35 checks passed
@dcaravel dcaravel deleted the dc/backport-lineage-fix branch January 16, 2025 22:46
@vikin91
Copy link
Contributor

vikin91 commented Jan 21, 2025

I am afraid, this commit broke the RHCOS node scanning. Not sure which particular cherry-picked PR did that, but version 2.35.1 works fine, whereas 2.35.2 is broken, so the bug must be somewhere here.

@dcaravel
Copy link
Contributor Author

I am afraid, this commit broke the RHCOS node scanning. Not sure which particular cherry-picked PR did that, but version 2.35.1 works fine, whereas 2.35.2 is broken, so the bug must be somewhere here.

Perhaps not 😉 - looks like the RHCOS issue is external data/OVAL related.

@vikin91
Copy link
Contributor

vikin91 commented Jan 24, 2025

I am afraid, this commit broke the RHCOS node scanning. Not sure which particular cherry-picked PR did that, but version 2.35.1 works fine, whereas 2.35.2 is broken, so the bug must be somewhere here.

Perhaps not 😉 - looks like the RHCOS issue is external data/OVAL related.

Indeed, the deeper investigation has been continued on Slack and there is no clear indication that this PR was faulty 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
generate-dumps-on-pr Generates the image based on dumps from the PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants