Update Test Platforms for RHEL 10

ComplianceAsCode · Jan 13, 2025 · ccc562a · ccc562a
1 parent 2b3b654
commit ccc562a
Show file tree

Hide file tree

Showing 36 changed files with 38 additions and 38 deletions.
diff --git a/...s/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_cis.pass.sh b/...s/audit_login_events/audit_rules_login_events_faillock/tests/auditctl_correct_cis.pass.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = audit
-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
+# platform = multi_platform_rhel
 # profiles = xccdf_org.ssgproject.content_profile_cis
 
 {{{ setup_auditctl_environment() }}}

diff --git a/...nts/audit_rules_login_events_faillock/tests/auditctl_correct_extra_permission_cis.pass.sh b/...nts/audit_rules_login_events_faillock/tests/auditctl_correct_extra_permission_cis.pass.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = audit
-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
+# platform = multi_platform_rhel
 # profiles = xccdf_org.ssgproject.content_profile_cis
 
 {{{ setup_auditctl_environment() }}}

diff --git a/...n_events/audit_rules_login_events_faillock/tests/auditctl_correct_without_key_cis.pass.sh b/...n_events/audit_rules_login_events_faillock/tests/auditctl_correct_without_key_cis.pass.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = audit
-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
+# platform = multi_platform_rhel
 # profiles = xccdf_org.ssgproject.content_profile_cis
 
 {{{ setup_auditctl_environment() }}}

diff --git a/...ogin_events/audit_rules_login_events_faillock/tests/auditctl_remove_all_rules_cis.fail.sh b/...ogin_events/audit_rules_login_events_faillock/tests/auditctl_remove_all_rules_cis.fail.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = audit
-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
+# platform = multi_platform_rhel
 # profiles = xccdf_org.ssgproject.content_profile_cis
 
 {{{ setup_auditctl_environment() }}}

diff --git a/...udit_login_events/audit_rules_login_events_faillock/tests/auditctl_wrong_rule_cis.fail.sh b/...udit_login_events/audit_rules_login_events_faillock/tests/auditctl_wrong_rule_cis.fail.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = audit
-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
+# platform = multi_platform_rhel
 # profiles = xccdf_org.ssgproject.content_profile_cis
 
 {{{ setup_auditctl_environment() }}}

diff --git a/...vents/audit_rules_login_events_faillock/tests/auditctl_wrong_rule_without_key_cis.fail.sh b/...vents/audit_rules_login_events_faillock/tests/auditctl_wrong_rule_without_key_cis.fail.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = audit
-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
+# platform = multi_platform_rhel
 # profiles = xccdf_org.ssgproject.content_profile_cis
 
 {{{ setup_auditctl_environment() }}}

diff --git a/...audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_cis.pass.sh b/...audit_login_events/audit_rules_login_events_faillock/tests/augenrules_correct_cis.pass.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = audit
-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
+# platform = multi_platform_rhel
 # profiles = xccdf_org.ssgproject.content_profile_cis
 
 path="/var/run/faillock"

diff --git a/...s/audit_rules_login_events_faillock/tests/augenrules_correct_extra_permission_cis.pass.sh b/...s/audit_rules_login_events_faillock/tests/augenrules_correct_extra_permission_cis.pass.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = audit
-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
+# platform = multi_platform_rhel
 # profiles = xccdf_org.ssgproject.content_profile_cis
 
 path="/var/run/faillock"

diff --git a/...events/audit_rules_login_events_faillock/tests/augenrules_correct_without_key_cis.pass.sh b/...events/audit_rules_login_events_faillock/tests/augenrules_correct_without_key_cis.pass.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = audit
-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
+# platform = multi_platform_rhel
 # profiles = xccdf_org.ssgproject.content_profile_cis
 
 path="/var/run/faillock"

diff --git a/...in_events/audit_rules_login_events_faillock/tests/augenrules_remove_all_rules_cis.fail.sh b/...in_events/audit_rules_login_events_faillock/tests/augenrules_remove_all_rules_cis.fail.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = audit
-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
+# platform = multi_platform_rhel
 # profiles = xccdf_org.ssgproject.content_profile_cis
 
 path="/var/run/faillock"

diff --git a/...it_login_events/audit_rules_login_events_faillock/tests/augenrules_wrong_rule_cis.fail.sh b/...it_login_events/audit_rules_login_events_faillock/tests/augenrules_wrong_rule_cis.fail.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = audit
-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
+# platform = multi_platform_rhel
 # profiles = xccdf_org.ssgproject.content_profile_cis
 
 path="/var/run/faillock"

diff --git a/...nts/audit_rules_login_events_faillock/tests/augenrules_wrong_rule_without_key_cis.fail.sh b/...nts/audit_rules_login_events_faillock/tests/augenrules_wrong_rule_without_key_cis.fail.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = audit
-# platform = Red Hat Enterprise Linux 8, Red Hat Enterprise Linux 9
+# platform = multi_platform_rhel
 # profiles = xccdf_org.ssgproject.content_profile_cis
 
 path="/var/run/faillock"

diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_rekey_limit/tests/rhel9_ospp_ok.pass.sh b/linux_os/guide/services/ssh/ssh_server/sshd_rekey_limit/tests/rhel9_ospp_ok.pass.sh
@@ -1,4 +1,4 @@
-# platform = Red Hat Enterprise Linux 9
+# platform = Red Hat Enterprise Linux 9, Red Hat Enterprise Linux 10
 # profiles = xccdf_org.ssgproject.content_profile_ospp
 
 mkdir -p /etc/ssh/sshd_config.d

diff --git a/...password_attempts/account_password_pam_faillock_password_auth/tests/correct_value.pass.sh b/...password_attempts/account_password_pam_faillock_password_auth/tests/correct_value.pass.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = authselect,pam
-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
+# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel
 
 authselect create-profile test_profile -b sssd
 authselect select "custom/test_profile" --force

diff --git a/..._out_password_attempts/account_password_pam_faillock_password_auth/tests/no_value.fail.sh b/..._out_password_attempts/account_password_pam_faillock_password_auth/tests/no_value.fail.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = authselect,pam
-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
+# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel
 
 authselect create-profile test_profile -b sssd
 authselect select "custom/test_profile" --force

diff --git a/...t_password_attempts/account_password_pam_faillock_system_auth/tests/correct_value.pass.sh b/...t_password_attempts/account_password_pam_faillock_system_auth/tests/correct_value.pass.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = authselect,pam
-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
+# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel
 
 authselect create-profile test_profile -b sssd
 authselect select "custom/test_profile" --force

diff --git a/...ng_out_password_attempts/account_password_pam_faillock_system_auth/tests/no_value.fail.sh b/...ng_out_password_attempts/account_password_pam_faillock_system_auth/tests/no_value.fail.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = authselect,pam
-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
+# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel
 
 authselect create-profile test_profile -b sssd
 authselect select "custom/test_profile" --force

diff --git a/...empts/accounts_passwords_pam_faillock_audit/tests/conflicting_settings_authselect.fail.sh b/...empts/accounts_passwords_pam_faillock_audit/tests/conflicting_settings_authselect.fail.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = authselect,pam
-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
+# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel
 
 source common.sh
 

diff --git a/...sword_attempts/accounts_passwords_pam_faillock_audit/tests/expected_faillock_conf.pass.sh b/...sword_attempts/accounts_passwords_pam_faillock_audit/tests/expected_faillock_conf.pass.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = authselect,pam
-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
+# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel
 
 source common.sh
 

diff --git a/...s/accounts_passwords_pam_faillock_deny_root/tests/conflicting_settings_authselect.fail.sh b/...s/accounts_passwords_pam_faillock_deny_root/tests/conflicting_settings_authselect.fail.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = authselect,pam
-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
+# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel
 
 pam_files=("password-auth" "system-auth")
 
@@ -20,7 +20,7 @@ for file in ${pam_files[@]}; do
     if grep -qP "auth.*faillock\.so.*preauth" $CUSTOM_PROFILE_DIR/$file; then
         sed -i "/^\s*auth.*faillock\.so.*preauth/ s/$/even_deny_root/" \
             "$CUSTOM_PROFILE_DIR/$file"
-    else 
+    else
         sed -i "0,/^\s*auth.*/i auth required pam_faillock.so preauth even_deny_root" \
         "$CUSTOM_PROFILE_DIR/$file"
     fi

diff --git a/...word_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_commented.fail.sh b/...word_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_commented.fail.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = authselect
-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
+# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel
 # variables = var_password_pam_retry=3
 
 source common.sh

diff --git a/...ssword_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_correct.pass.sh b/...ssword_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_correct.pass.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = authselect
-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
+# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel
 # variables = var_password_pam_retry=3
 
 source common.sh

diff --git a/...ity_pwquality/accounts_password_pam_retry/tests/pwquality_conf_correct_with_space.pass.sh b/...ity_pwquality/accounts_password_pam_retry/tests/pwquality_conf_correct_with_space.pass.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = authselect
-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
+# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel
 # variables = var_password_pam_retry=3
 
 source common.sh

diff --git a/...word_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_overriden.fail.sh b/...word_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_overriden.fail.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = authselect
-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
+# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel
 # variables = var_password_pam_retry=3
 
 source common.sh

diff --git a/...password_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_wrong.fail.sh b/...password_quality_pwquality/accounts_password_pam_retry/tests/pwquality_conf_wrong.fail.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = authselect
-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
+# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel
 # variables = var_password_pam_retry=3
 
 source common.sh

diff --git a/...tions/sysctl_kernel_unprivileged_bpf_disabled_accept_default/tests/system_default.pass.sh b/...tions/sysctl_kernel_unprivileged_bpf_disabled_accept_default/tests/system_default.pass.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# platform = Red Hat Enterprise Linux 9
+# platform = Red Hat Enterprise Linux 9,Red Hat Enterprise Linux 10
 
 # Clean sysctl config directories
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*
diff --git a/...restrictions/sysctl_kernel_unprivileged_bpf_disabled_accept_default/tests/value_0.fail.sh b/...restrictions/sysctl_kernel_unprivileged_bpf_disabled_accept_default/tests/value_0.fail.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# platform = Red Hat Enterprise Linux 9
+# platform = Red Hat Enterprise Linux 9,Red Hat Enterprise Linux 10
 
 # Clean sysctl config directories
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*

diff --git a/...restrictions/sysctl_kernel_unprivileged_bpf_disabled_accept_default/tests/value_1.pass.sh b/...restrictions/sysctl_kernel_unprivileged_bpf_disabled_accept_default/tests/value_1.pass.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# platform = Red Hat Enterprise Linux 9
+# platform = Red Hat Enterprise Linux 9,Red Hat Enterprise Linux 10
 
 # Clean sysctl config directories
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*

diff --git a/...restrictions/sysctl_kernel_unprivileged_bpf_disabled_accept_default/tests/value_2.pass.sh b/...restrictions/sysctl_kernel_unprivileged_bpf_disabled_accept_default/tests/value_2.pass.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# platform = Red Hat Enterprise Linux 9
+# platform = Red Hat Enterprise Linux 9,Red Hat Enterprise Linux 10
 
 # Clean sysctl config directories
 rm -rf /usr/lib/sysctl.d/* /run/sysctl.d/* /etc/sysctl.d/*

diff --git a/...tware/integrity/crypto/configure_crypto_policy/tests/config_and_current_same_time.pass.sh b/...tware/integrity/crypto/configure_crypto_policy/tests/config_and_current_same_time.pass.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
+# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel
 # packages = crypto-policies-scripts
 
 # IMPORTANT: This is a false negative scenario.

diff --git a/...software/integrity/crypto/configure_crypto_policy/tests/config_newer_than_current.fail.sh b/...software/integrity/crypto/configure_crypto_policy/tests/config_newer_than_current.fail.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
+# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel
 # packages = crypto-policies-scripts
 
 update-crypto-policies --set "DEFAULT"

diff --git a/...system/software/integrity/crypto/configure_crypto_policy/tests/missing_nss_config.fail.sh b/...system/software/integrity/crypto/configure_crypto_policy/tests/missing_nss_config.fail.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
+# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel
 # profiles = xccdf_org.ssgproject.content_profile_ospp
 # packages = crypto-policies-scripts
 

diff --git a/...system/software/integrity/crypto/configure_crypto_policy/tests/nss_config_as_file.pass.sh b/...system/software/integrity/crypto/configure_crypto_policy/tests/nss_config_as_file.pass.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
+# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel
 # profiles = xccdf_org.ssgproject.content_profile_ospp
 # packages = crypto-policies-scripts
 

diff --git a/...tem/software/integrity/crypto/configure_crypto_policy/tests/nss_config_as_symlink.pass.sh b/...tem/software/integrity/crypto/configure_crypto_policy/tests/nss_config_as_symlink.pass.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
+# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel
 # profiles = xccdf_org.ssgproject.content_profile_ospp
 # packages = crypto-policies-scripts
 

diff --git a/...stem/software/integrity/crypto/configure_crypto_policy/tests/policy_fips_ospp_set.pass.sh b/...stem/software/integrity/crypto/configure_crypto_policy/tests/policy_fips_ospp_set.pass.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
+# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel
 # profiles = xccdf_org.ssgproject.content_profile_ospp
 # packages = crypto-policies-scripts
 

diff --git a/shared/templates/pam_account_password_faillock/tests/conflicting_settings_authselect.fail.sh b/shared/templates/pam_account_password_faillock/tests/conflicting_settings_authselect.fail.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # packages = authselect,pam
-# platform = Oracle Linux 8,Oracle Linux 9,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9
+# platform = Oracle Linux 8,Oracle Linux 9,multi_platform_rhel
 
 {{{ tests_init_faillock_vars("correct") }}}
 
@@ -23,7 +23,7 @@ for file in ${pam_files[@]}; do
     if grep -qP "auth.*faillock\.so.*preauth" $CUSTOM_PROFILE_DIR/$file; then
         sed -i "/^\s*auth.*faillock\.so.*preauth/ s/$/$PRM_NAME=$TEST_VALUE/" \
             "$CUSTOM_PROFILE_DIR/$file"
-    else 
+    else
         sed -i "0,/^\s*auth.*/i auth required pam_faillock.so preauth $PRM_NAME=$TEST_VALUE" \
         "$CUSTOM_PROFILE_DIR/$file"
     fi