From c2281b8aa48008ef2483757ddb3d1d65db5a34cc Mon Sep 17 00:00:00 2001 From: Miha Purg Date: Wed, 21 Feb 2024 16:13:26 +0100 Subject: [PATCH] Fix ubuntu tests in template grub2_bootloader_argument --- .../tests/arg_not_there_etcdefaultgrub.fail.sh | 6 +++++- .../grub2_bootloader_argument/tests/correct_value.pass.sh | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/shared/templates/grub2_bootloader_argument/tests/arg_not_there_etcdefaultgrub.fail.sh b/shared/templates/grub2_bootloader_argument/tests/arg_not_there_etcdefaultgrub.fail.sh index 93907c79405..b594abe6de4 100644 --- a/shared/templates/grub2_bootloader_argument/tests/arg_not_there_etcdefaultgrub.fail.sh +++ b/shared/templates/grub2_bootloader_argument/tests/arg_not_there_etcdefaultgrub.fail.sh @@ -1,7 +1,11 @@ #!/bin/bash -# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel +# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_ubuntu +{{%- if 'ubuntu' in product %}} +# packages = grub2 +{{%- else %}} # packages = grub2,grubby +{{%- endif %}} source common.sh diff --git a/shared/templates/grub2_bootloader_argument/tests/correct_value.pass.sh b/shared/templates/grub2_bootloader_argument/tests/correct_value.pass.sh index 2a0ea70caeb..25f7d6a8f62 100644 --- a/shared/templates/grub2_bootloader_argument/tests/correct_value.pass.sh +++ b/shared/templates/grub2_bootloader_argument/tests/correct_value.pass.sh @@ -1,7 +1,12 @@ #!/bin/bash # platform = multi_platform_all +{{%- if 'ubuntu' in product %}} +# packages = grub2 +{{%- else %}} # packages = grub2,grubby +{{%- endif %}} + {{%- if ARG_VARIABLE %}} # variables = {{{ ARG_VARIABLE }}}=correct_value {{%- set ARG_NAME_VALUE= ARG_NAME ~ "=correct_value" %}}