Skip to content

OCPBUGS-55140: Enhance RHCOS checks to include CoreOS variant for 4.19 #13369

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

Merged
rhmdnd merged 1 commit into from
Apr 22, 2025
Merged

OCPBUGS-55140: Enhance RHCOS checks to include CoreOS variant for 4.19 #13369

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 33 additions & 2 deletions shared/checks/oval/installed_OS_is_rhcos4.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,15 @@
<description>The operating system installed on the system is
Red Hat Enterprise Linux CoreOS release 4</description>
</metadata>
<criteria>
<criteria operator="OR">
<criteria operator="AND">
<criterion comment="RHCOS is installed" test_ref="test_rhcos" />
<criterion comment="RHCOS is installed (ID='rhcos')" test_ref="test_rhcos" />
<criterion comment="RHCOS version 4 is installed" test_ref="test_rhcos4" />
</criteria>
<criteria operator="AND">
<criterion comment="CoreOS variant" test_ref="test_rhel_coreos_variant" />
<criterion comment="Major version is 9" test_ref="test_rhel_coreos_version9" />
</criteria>
</criteria>
</definition>

Expand All @@ -30,6 +34,33 @@
<ind:subexpression operation="pattern match">rhcos</ind:subexpression>
</ind:textfilecontent54_state>

<ind:textfilecontent54_test check="all" id="test_rhel_coreos_variant" comment="Check for variant=CoreOS" version="1">
<ind:object object_ref="obj_rhel_coreos_variant" />
<ind:state state_ref="state_rhel_coreos_variant" />
</ind:textfilecontent54_test>
<ind:textfilecontent54_object id="obj_rhel_coreos_variant" version="1">
<ind:filepath>/etc/os-release</ind:filepath>
<ind:pattern operation="pattern match">^VARIANT_ID=(\S+)$</ind:pattern>
<ind:instance operation="greater than or equal" datatype="int">1</ind:instance>
</ind:textfilecontent54_object>
<ind:textfilecontent54_state id="state_rhel_coreos_variant" version="1">
<ind:subexpression operation="pattern match">coreos</ind:subexpression>
</ind:textfilecontent54_state>

<ind:textfilecontent54_test check="all" id="test_rhel_coreos_version9" comment="Check if VERSION_ID=9.x" version="1">
<ind:object object_ref="obj_rhel_coreos_version9" />
<ind:state state_ref="state_rhel_coreos_version9" />
</ind:textfilecontent54_test>
<ind:textfilecontent54_object id="obj_rhel_coreos_version9" version="1">
<ind:filepath>/etc/os-release</ind:filepath>
<ind:pattern operation="pattern match">^VERSION_ID=&quot;(\d+\.\d+)&quot;$</ind:pattern>
<ind:instance operation="greater than or equal" datatype="int">1</ind:instance>
</ind:textfilecontent54_object>
<ind:textfilecontent54_state id="state_rhel_coreos_version9" version="1">
<ind:subexpression operation="pattern match">^9\.</ind:subexpression>
</ind:textfilecontent54_state>


<ind:textfilecontent54_test check="all" comment="rhcoreos is version 4" id="test_rhcos4" version="1">
<ind:object object_ref="obj_rhcos4" />
<ind:state state_ref="state_rhcos4" />
Expand Down
Loading