From 608404086626b65fb477e59ef94e4d206dad0bab Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Wed, 26 Jun 2024 10:53:45 -0500 Subject: [PATCH] Adjust platforms in shared tests for RHEL 7 removal --- .../tests/arg_there_etcdefaultgrub.fail.sh | 2 +- .../tests/arg_value_there_etcdefaultgrub.fail.sh | 2 +- .../tests/mising_arg_invalid_rescue.pass.sh | 2 +- .../tests/pam_faillock_expected_pam_files.pass.sh | 2 +- .../tests/pam_faillock_lenient_pam_files.fail.sh | 2 +- .../tests/pam_faillock_multiple_pam_unix_pam_files.fail.sh | 2 +- .../tests/pam_faillock_stricter_pam_files.pass.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/shared/templates/grub2_bootloader_argument_absent/tests/arg_there_etcdefaultgrub.fail.sh b/shared/templates/grub2_bootloader_argument_absent/tests/arg_there_etcdefaultgrub.fail.sh index 46ca336235a..fc3db8ccd5e 100644 --- a/shared/templates/grub2_bootloader_argument_absent/tests/arg_there_etcdefaultgrub.fail.sh +++ b/shared/templates/grub2_bootloader_argument_absent/tests/arg_there_etcdefaultgrub.fail.sh @@ -1,6 +1,6 @@ #!/bin/bash -# platform = Red Hat Enterprise Linux 7,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9 +# platform = multi_platform_rhel # packages = grub2-tools,grubby # Adds argument from kernel command line in /etc/default/grub diff --git a/shared/templates/grub2_bootloader_argument_absent/tests/arg_value_there_etcdefaultgrub.fail.sh b/shared/templates/grub2_bootloader_argument_absent/tests/arg_value_there_etcdefaultgrub.fail.sh index e5ce738c392..e51f669fdb9 100644 --- a/shared/templates/grub2_bootloader_argument_absent/tests/arg_value_there_etcdefaultgrub.fail.sh +++ b/shared/templates/grub2_bootloader_argument_absent/tests/arg_value_there_etcdefaultgrub.fail.sh @@ -1,6 +1,6 @@ #!/bin/bash -# platform = Red Hat Enterprise Linux 7,Red Hat Enterprise Linux 8,Red Hat Enterprise Linux 9 +# platform = multi_platform_rhel # packages = grub2-tools,grubby # Adds argument with a value from kernel command line in /etc/default/grub diff --git a/shared/templates/grub2_bootloader_argument_absent/tests/mising_arg_invalid_rescue.pass.sh b/shared/templates/grub2_bootloader_argument_absent/tests/mising_arg_invalid_rescue.pass.sh index 511a643359d..9eda415667a 100644 --- a/shared/templates/grub2_bootloader_argument_absent/tests/mising_arg_invalid_rescue.pass.sh +++ b/shared/templates/grub2_bootloader_argument_absent/tests/mising_arg_invalid_rescue.pass.sh @@ -1,4 +1,4 @@ -# platform = Red Hat Enterprise Linux 7,Red Hat Enterprise Linux 9 +# platform = Red Hat Enterprise Linux 9,Red Hat Enterprise Linux 10 # packages = grub2,grubby # Ensure the kernel command line for each installed kernel in the bootloader diff --git a/shared/templates/pam_account_password_faillock/tests/pam_faillock_expected_pam_files.pass.sh b/shared/templates/pam_account_password_faillock/tests/pam_faillock_expected_pam_files.pass.sh index 24936609706..bbf97fa2ac0 100644 --- a/shared/templates/pam_account_password_faillock/tests/pam_faillock_expected_pam_files.pass.sh +++ b/shared/templates/pam_account_password_faillock/tests/pam_faillock_expected_pam_files.pass.sh @@ -1,6 +1,6 @@ #!/bin/bash # packages = authconfig -# platform = Oracle Linux 7,Red Hat Enterprise Linux 7,multi_platform_fedora +# platform = Oracle Linux 7,multi_platform_fedora # variables = var_accounts_passwords_pam_faillock_deny=3 authconfig --enablefaillock --faillockargs="deny=3" --update diff --git a/shared/templates/pam_account_password_faillock/tests/pam_faillock_lenient_pam_files.fail.sh b/shared/templates/pam_account_password_faillock/tests/pam_faillock_lenient_pam_files.fail.sh index 34405f59422..cb1ca930499 100644 --- a/shared/templates/pam_account_password_faillock/tests/pam_faillock_lenient_pam_files.fail.sh +++ b/shared/templates/pam_account_password_faillock/tests/pam_faillock_lenient_pam_files.fail.sh @@ -1,6 +1,6 @@ #!/bin/bash # packages = authconfig -# platform = Oracle Linux 7,Red Hat Enterprise Linux 7,multi_platform_fedora +# platform = Oracle Linux 7,multi_platform_fedora # variables = var_accounts_passwords_pam_faillock_deny=3 authconfig --enablefaillock --faillockargs="deny=5" --update diff --git a/shared/templates/pam_account_password_faillock/tests/pam_faillock_multiple_pam_unix_pam_files.fail.sh b/shared/templates/pam_account_password_faillock/tests/pam_faillock_multiple_pam_unix_pam_files.fail.sh index dbc12db6b9f..51d94b3333b 100644 --- a/shared/templates/pam_account_password_faillock/tests/pam_faillock_multiple_pam_unix_pam_files.fail.sh +++ b/shared/templates/pam_account_password_faillock/tests/pam_faillock_multiple_pam_unix_pam_files.fail.sh @@ -1,6 +1,6 @@ #!/bin/bash # packages = authconfig -# platform = Oracle Linux 7,Red Hat Enterprise Linux 7,multi_platform_fedora +# platform = Oracle Linux 7,multi_platform_fedora # remediation = none # variables = var_accounts_passwords_pam_faillock_deny=3 diff --git a/shared/templates/pam_account_password_faillock/tests/pam_faillock_stricter_pam_files.pass.sh b/shared/templates/pam_account_password_faillock/tests/pam_faillock_stricter_pam_files.pass.sh index 03f93edaa4f..54729a3144b 100644 --- a/shared/templates/pam_account_password_faillock/tests/pam_faillock_stricter_pam_files.pass.sh +++ b/shared/templates/pam_account_password_faillock/tests/pam_faillock_stricter_pam_files.pass.sh @@ -1,6 +1,6 @@ #!/bin/bash # packages = authconfig -# platform = Oracle Linux 7,Red Hat Enterprise Linux 7,multi_platform_fedora +# platform = Oracle Linux 7,multi_platform_fedora # variables = var_accounts_passwords_pam_faillock_deny=3 authconfig --enablefaillock --faillockargs="deny=2" --update