Skip to content

Commit 0185710

Browse files
committed
CI tests should run on x86 and arm , not on ppc64le since it doesnt support smbios
1 parent 0ea7297 commit 0185710

4 files changed

Lines changed: 18 additions & 8 deletions

File tree

mkosi.conf.d/fedora/mkosi.conf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,3 @@ Distribution=fedora
55

66
[Distribution]
77
Release=rawhide
8-
9-
[Content]
10-
# kernel-uki-virt ships a pre-built UKI for virtual machines, needed to test
11-
# Bootloader=uki-prebuilt.
12-
Packages=
13-
kernel-uki-virt

mkosi.conf.d/fedora/mkosi.conf.d/arm64.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,9 @@
44
Architecture=arm64
55

66
[Content]
7+
# kernel-uki-virt ships a pre-built UKI for virtual machines, needed to test
8+
# Bootloader=uki-prebuilt. Kept in arch-specific configs (not fedora/mkosi.conf)
9+
# because the package is not available on all Fedora architectures (e.g. ppc64le).
710
Packages=
11+
kernel-uki-virt
812
shim-unsigned-aarch64

mkosi.conf.d/fedora/mkosi.conf.d/x86_64.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
Architecture=x86-64
55

66
[Content]
7+
# kernel-uki-virt ships a pre-built UKI for virtual machines, needed to test
8+
# Bootloader=uki-prebuilt. Kept in arch-specific configs (not fedora/mkosi.conf)
9+
# because the package is not available on all Fedora architectures (e.g. ppc64le).
710
Packages=
811
amd-ucode-firmware
12+
kernel-uki-virt
913
shim-unsigned-x64

tests/test_boot.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import pytest
77

8-
from mkosi.config import Bootloader, Firmware, OutputFormat
8+
from mkosi.config import Architecture, Bootloader, Firmware, OutputFormat
99
from mkosi.distribution import Distribution
1010
from mkosi.run import find_binary, run
1111
from mkosi.versioncomp import GenericVersion
@@ -62,7 +62,15 @@ def test_bootloader(config: ImageConfig, bootloader: Bootloader) -> None:
6262
if config.distribution == Distribution.rhel_ubi or bootloader.is_signed():
6363
return
6464

65-
if bootloader.is_prebuilt_uki() and config.distribution != Distribution.fedora:
65+
# uki-prebuilt test matrix:
66+
# x86-64 Fedora → supports_smbios(uefi)=True, kernel-uki-virt available → runs
67+
# arm64 Fedora → supports_smbios(uefi)=True, kernel-uki-virt available → runs
68+
# ppc64le Fedora → supports_smbios(uefi)=False → skipped
69+
# non-Fedora → no kernel-uki-virt equivalent → skipped
70+
if bootloader.is_prebuilt_uki() and (
71+
config.distribution != Distribution.fedora
72+
or not Architecture.native().supports_smbios(Firmware.uefi)
73+
):
6674
return
6775

6876
firmware = Firmware.linux if bootloader == Bootloader.none else Firmware.auto

0 commit comments

Comments
 (0)