Skip to content

Commit d7a899d

Browse files
committed
ci: Add a systemd-boot+shim integration leg
No CI leg installs systemd-boot through bootupd: every bootloader=systemd test image drops bootupd and shim, so the bootctl path is all that runs. Add one composefs leg, unsealed BLS on ext4, whose image keeps bootupd and shim and registers the distribution's signed systemd-boot with bootupd. Its matrix value, systemd-shim, is the only one that is not a bootc bootloader: the job maps it to BOOTC_bootloader=systemd, which the image's install config hands to bootc, plus BOOTC_sdboot_shim=1. Fedora 45 and rawhide are the only tested OSes that ship a signed systemd-boot laid out as a bootupd component, so both join the integration OS list for this leg alone: everything else stays excluded there, the leg stays excluded everywhere else, and test-baseconfigs, which reads the same OS list, excludes them too. Rawhide is allowed to fail, as it already is in the package job; Fedora 45 is the leg that gates. Generated-by: AI Signed-off-by: Christian Glombek <c.glombek@cosa.systems>
1 parent 063ed3d commit d7a899d

1 file changed

Lines changed: 46 additions & 4 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ jobs:
121121
|| echo "$LABELS" | jq -e 'index("ci/merge")' > /dev/null; }; then
122122
# Full suite: all OSes
123123
echo 'package_os_matrix=["fedora-44","fedora-45","fedora-46","centos-9","centos-10"]' >> "$GITHUB_OUTPUT"
124-
echo 'integration_os_matrix=["fedora-44","centos-9","centos-10"]' >> "$GITHUB_OUTPUT"
124+
# fedora-45 and fedora-46 only run the systemd-shim leg, see the excludes below
125+
echo 'integration_os_matrix=["fedora-44","fedora-45","fedora-46","centos-9","centos-10"]' >> "$GITHUB_OUTPUT"
125126
echo 'upgrade_os_matrix=["fedora-44","centos-10"]' >> "$GITHUB_OUTPUT"
126127
echo 'run_heavy=true' >> "$GITHUB_OUTPUT"
127128
elif [[ "$DOCS_ONLY" != "true" ]] && echo "$LABELS" | jq -e 'index("ci/tier-1")' > /dev/null; then
@@ -301,7 +302,7 @@ jobs:
301302
test_os: ${{ fromJson(needs.compute-ci-level.outputs.integration_os_matrix) }}
302303
variant: [ostree, composefs]
303304
filesystem: ["ext4", "xfs"]
304-
bootloader: ["grub", "grub-cc", "systemd"]
305+
bootloader: ["grub", "grub-cc", "systemd", "systemd-shim"]
305306
boot_type: ["bls", "uki"]
306307
seal_state: ["sealed", "unsealed"]
307308

@@ -349,7 +350,38 @@ jobs:
349350
- bootloader: grub-cc
350351
seal_state: sealed
351352

353+
# systemd-boot behind shim, installed through bootupd: one composefs
354+
# leg, unsealed BLS on ext4, on Fedora 45 and rawhide only, the
355+
# tested OSes that ship a signed systemd-boot laid out as a bootupd
356+
# component (rawhide is allowed to fail, as in the package job).
357+
- variant: ostree
358+
bootloader: systemd-shim
359+
- bootloader: systemd-shim
360+
seal_state: sealed
361+
- bootloader: systemd-shim
362+
boot_type: uki
363+
- bootloader: systemd-shim
364+
filesystem: xfs
365+
- test_os: fedora-44
366+
bootloader: systemd-shim
367+
- test_os: centos-9
368+
bootloader: systemd-shim
369+
- test_os: centos-10
370+
bootloader: systemd-shim
371+
# and those two run nothing else
372+
- test_os: fedora-45
373+
bootloader: grub
374+
- test_os: fedora-45
375+
bootloader: systemd
376+
- test_os: fedora-46
377+
bootloader: grub
378+
- test_os: fedora-46
379+
bootloader: grub-cc
380+
- test_os: fedora-46
381+
bootloader: systemd
382+
352383
runs-on: ubuntu-26.04
384+
continue-on-error: ${{ matrix.test_os == 'fedora-46' }}
353385

354386
steps:
355387
- uses: actions/checkout@v7
@@ -371,7 +403,14 @@ jobs:
371403
372404
echo "BOOTC_variant=${{ matrix.variant }}" >> $GITHUB_ENV
373405
echo "BOOTC_filesystem=${{ matrix.filesystem }}" >> $GITHUB_ENV
374-
echo "BOOTC_bootloader=${{ matrix.bootloader }}" >> $GITHUB_ENV
406+
bootloader="${{ matrix.bootloader }}"
407+
if [[ "${bootloader}" == systemd-shim ]]; then
408+
# Not a bootc bootloader: systemd-boot, which the image's install
409+
# config requests, installed through bootupd with shim in front of it
410+
bootloader=systemd
411+
echo "BOOTC_sdboot_shim=1" >> $GITHUB_ENV
412+
fi
413+
echo "BOOTC_bootloader=${bootloader}" >> $GITHUB_ENV
375414
echo "BOOTC_boot_type=${{ matrix.boot_type }}" >> $GITHUB_ENV
376415
echo "BOOTC_seal_state=${{ matrix.seal_state }}" >> $GITHUB_ENV
377416
@@ -405,7 +444,7 @@ jobs:
405444
- name: Run TMT integration tests
406445
run: |
407446
if [[ "${{ matrix.variant }}" = composefs ]]; then
408-
just test-composefs "${{ matrix.bootloader }}" "${{ matrix.filesystem }}" "${{ matrix.boot_type }}" "${{ matrix.seal_state }}"
447+
just test-composefs "$BOOTC_bootloader" "${{ matrix.filesystem }}" "${{ matrix.boot_type }}" "${{ matrix.seal_state }}"
409448
else
410449
just test-tmt integration
411450
fi
@@ -513,6 +552,9 @@ jobs:
513552
exclude:
514553
# centos-9 ships an older dracut that lacks the auto-install of setup-root-conf.toml
515554
- test_os: centos-9
555+
# fedora-45 and fedora-46 are in the integration OS list only for the systemd-shim leg
556+
- test_os: fedora-45
557+
- test_os: fedora-46
516558

517559
runs-on: ubuntu-26.04
518560

0 commit comments

Comments
 (0)