Merge pull request #12156 from vojtapolasek/add_rhel10_to_prods_in_gr…

…ub2_template templates: add rhel10 to conditional macros where rhel9 is mentioned
ComplianceAsCode · Jul 16, 2024 · 520a196 · 520a196
2 parents 62fb24b + a5260ef
commit 520a196
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/shared/templates/grub2_bootloader_argument/oval.template b/shared/templates/grub2_bootloader_argument/oval.template
@@ -13,7 +13,7 @@
 {{% set system_with_expanded_kernel_options_in_grub_cfg = false -%}}
 {{% set system_with_bios_and_uefi_support = false -%}}
 
-{{% if product in ["fedora", "ol9", "rhel9"] -%}}
+{{% if product in ["fedora", "ol9", "rhel9", "rhel10"] -%}}
 {{% set system_with_expanded_kernel_options_in_loader_entries = true %}}
 {{%- endif -%}}
 

diff --git a/shared/templates/grub2_bootloader_argument/tests/invalid_rescue.pass.sh b/shared/templates/grub2_bootloader_argument/tests/invalid_rescue.pass.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# platform = Red Hat Enterprise Linux 9,multi_platform_fedora
+# platform = Red Hat Enterprise Linux 9,Red Hat Enterprise Linux 10,multi_platform_fedora
 # packages = grub2,grubby
 {{%- if ARG_VARIABLE %}}
 # variables = {{{ ARG_VARIABLE }}}=correct_value

diff --git a/shared/templates/grub2_bootloader_argument/tests/wrong_value_entries.fail.sh b/shared/templates/grub2_bootloader_argument/tests/wrong_value_entries.fail.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# platform = Red Hat Enterprise Linux 9,multi_platform_fedora
+# platform = Red Hat Enterprise Linux 9,Red Hat Enterprise Linux 10,multi_platform_fedora
 # packages = grub2,grubby
 
 source common.sh

diff --git a/shared/templates/grub2_bootloader_argument_absent/oval.template b/shared/templates/grub2_bootloader_argument_absent/oval.template
@@ -12,7 +12,7 @@
 {{% set system_with_expanded_kernel_options_in_grub_cfg = false -%}}
 {{% set system_with_bios_and_uefi_support = false -%}}
 
-{{% if product in ["ol9", "rhel9"] -%}}
+{{% if product in ["ol9", "rhel9", "rhel10"] -%}}
 {{% set system_with_expanded_kernel_options_in_loader_entries = true %}}
 {{%- endif -%}}
 

diff --git a/shared/templates/sebool/ansible.template b/shared/templates/sebool/ansible.template
@@ -4,7 +4,7 @@
 # complexity = low
 # disruption = low
 
-{{% if product in ['ol8', 'ol9', 'rhel8', 'rhel9'] %}}
+{{% if product in ['ol8', 'ol9', 'rhel8', 'rhel9', 'rhel10'] %}}
 {{% set PACKAGE_NAME = "python3-libsemanage" %}}
 {{% elif product == "sle15" %}}
 {{% set PACKAGE_NAME = "policycoreutils" %}}

diff --git a/shared/templates/sebool/bash.template b/shared/templates/sebool/bash.template
@@ -4,7 +4,7 @@
 # complexity = low
 # disruption = low
 
-{{% if product in ['ol8', 'ol9', 'rhel8', 'rhel9'] %}}
+{{% if product in ['ol8', 'ol9', 'rhel8', 'rhel9', 'rhel10'] %}}
 {{{ bash_package_install("python3-libsemanage") }}}
 {{% elif product == "sle15" %}}
 {{{ bash_package_install("policycoreutils") }}}