particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test/cases: Use openscap customization on RHEL-10

Browse source
This commit is contained in:
Jakub Rusz 2024-09-10 09:03:29 +02:00 • committed by Tomáš Hozza
parent 8cf9a542ab
commit ec4aff7e58
2 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
test/cases/api.sh
View file

@ -419,11 +419,6 @@ EOF
;; ;;
esac 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 export OPENSCAP_CUSTOMIZATION_BLOCK
TIMEZONE_CUSTOMIZATION_BLOCK=$(cat <<EOF TIMEZONE_CUSTOMIZATION_BLOCK=$(cat <<EOF

7
test/cases/api/common/common.sh
View file

@ -82,12 +82,7 @@ function _instanceCheck() {
verify_dirs_files_customization "$_ssh" verify_dirs_files_customization "$_ssh"
verify_repository_customization "$_ssh" verify_repository_customization "$_ssh"
# TODO: Remove once Openscap works on el-10 verify_openscap_customization "$_ssh"
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
echo "✔️ Checking timezone customization" echo "✔️ Checking timezone customization"
TZ=$($_ssh timedatectl show -p Timezone --value) TZ=$($_ssh timedatectl show -p Timezone --value)