diff --git a/.github/workflows/unit_tests.sh b/.github/workflows/unit_tests.sh index 7275a72dc5f..94ecdc60721 100755 --- a/.github/workflows/unit_tests.sh +++ b/.github/workflows/unit_tests.sh @@ -24,6 +24,7 @@ ADDITIONAL_DEPS=( python3-pyparsing python3-pytest rpm + systemd-boot-efi zstd ) diff --git a/src/ukify/test/test_ukify.py b/src/ukify/test/test_ukify.py index 0f974b3558b..0de7e8904db 100755 --- a/src/ukify/test/test_ukify.py +++ b/src/ukify/test/test_ukify.py @@ -59,6 +59,8 @@ except ValueError: slow_tests = True arg_tools = ['--tools', build_root] if build_root else [] +if build_root and pathlib.Path(f"{build_root}/linux{ukify.guess_efi_arch()}.efi.stub").exists(): + arg_tools += ['--stub', f"{build_root}/linux{ukify.guess_efi_arch()}.efi.stub"] def systemd_measure(): opts = ukify.create_parser().parse_args(arg_tools) @@ -409,6 +411,8 @@ def test_help_error(capsys): @pytest.fixture(scope='session') def kernel_initrd(): items = sorted(glob.glob('/lib/modules/*/vmlinuz')) + if not items: + items = sorted(glob.glob('/boot/vmlinuz*')) if not items: return None @@ -657,7 +661,7 @@ def test_inspect(kernel_initrd, tmp_path, capsys): f'--os-release={osrel_arg}', f'--uname={uname_arg}', f'--output={output}', - ] + ] + arg_tools if slow_tests: args += [ f'--secureboot-certificate={cert.name}',