Skip to content

Commit

Permalink
test/cases: Use openscap customization on RHEL-10
Browse files Browse the repository at this point in the history
  • Loading branch information
jrusz committed Sep 24, 2024
1 parent 9782abe commit d25b00d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
5 changes: 0 additions & 5 deletions test/cases/api.sh
Original file line number Diff line number Diff line change
Expand Up @@ -419,11 +419,6 @@ EOF
;;
esac

# TODO: Remove once Openscap works on el-10
if [[ ($ID == rhel || $ID == centos) && ${VERSION_ID%.*} == 10 ]]; then
yellowprint "OpenSCAP not supported on ${ID}-${VERSION_ID} now. No openscap profile applied!"
OPENSCAP_CUSTOMIZATION_BLOCK=
fi
export OPENSCAP_CUSTOMIZATION_BLOCK

TIMEZONE_CUSTOMIZATION_BLOCK=$(cat <<EOF
Expand Down
7 changes: 1 addition & 6 deletions test/cases/api/common/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,7 @@ function _instanceCheck() {
verify_dirs_files_customization "$_ssh"

verify_repository_customization "$_ssh"
# TODO: Remove once Openscap works on el-10
if [[ ($ID == rhel || $ID == centos) && ${VERSION_ID%.*} == 10 ]]; then
yellowprint "OpenSCAP not supported on ${ID}-${VERSION_ID} now. No verification made!"
else
verify_openscap_customization "$_ssh"
fi
verify_openscap_customization "$_ssh"

echo "✔️ Checking timezone customization"
TZ=$($_ssh timedatectl show -p Timezone --value)
Expand Down

0 comments on commit d25b00d

Please sign in to comment.