Skip to content

Conversation

@vojtapolasek
Copy link
Collaborator

Description:

  • check also for presence of /run/ostree-booted file
  • I made modifications to both OVAL files - one in shared/applicability/oval, another in shared/checks/oval, I am not sure when the shared/checks/oval/bootc.xml is used, but I think it is a good idea to keep them in sync

Rationale:

Review Hints:

Build content not including this PR:

  1. Run a RHEL VM, install rpm-ostree, bootc
  2. oscap xccdf eval --profile stig --rule xccdf_org.ssgproject.content_rule_enable_dracut_fips_module ssg-rhel9-ds.xml

This should result in "not applicable", although it should be applicable.

Build the content with this PR and repeat steps above.

The result will be probably "fail", but definitely not "not applicable".

@vojtapolasek vojtapolasek added this to the 0.1.79 milestone Oct 17, 2025
@vojtapolasek vojtapolasek added the CPE-AL CPE Applicability Language label Oct 17, 2025
@vojtapolasek vojtapolasek changed the title enhance OVAL check for applicability in bootc env WIP: enhance OVAL check for applicability in bootc env Oct 17, 2025
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Used by openshift-ci bot. label Oct 17, 2025
@vojtapolasek vojtapolasek marked this pull request as draft October 17, 2025 13:26
@vojtapolasek vojtapolasek force-pushed the enhance_bootc_applicability branch from cc0d72d to dd8736e Compare November 4, 2025 13:55
@vojtapolasek vojtapolasek force-pushed the enhance_bootc_applicability branch from 3fd4564 to 117421d Compare November 5, 2025 14:04
@vojtapolasek vojtapolasek marked this pull request as ready for review November 5, 2025 14:13
@vojtapolasek
Copy link
Collaborator Author

I added the Bash and Ansible conditional. Both confirmed with SMEs and also manually checked on regular vs bootc system. They work.

@vojtapolasek vojtapolasek changed the title WIP: enhance OVAL check for applicability in bootc env Enhance OVAL check for applicability in bootc env Nov 5, 2025
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Used by openshift-ci bot. label Nov 5, 2025
@openshift-ci
Copy link

openshift-ci bot commented Nov 5, 2025

@vojtapolasek: The following tests 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-aws-openshift-platform-compliance 117421d link true /test e2e-aws-openshift-platform-compliance
ci/prow/e2e-aws-openshift-node-compliance 117421d link true /test e2e-aws-openshift-node-compliance

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.

@comps
Copy link
Collaborator

comps commented Nov 6, 2025

LGTM. Per my testing, it does seem to fix #13990 filed by me.

@ggbecker ggbecker self-assigned this Nov 6, 2025
@ggbecker ggbecker merged commit f471d0c into ComplianceAsCode:master Nov 6, 2025
138 of 140 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CPE-AL CPE Applicability Language

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Bootc detection easily matches non-bootc systems

3 participants