Skip to content

Commit fdb5078

Browse files
mcmilktonyhutter
authored andcommitted
CI: Add Debian 13 to the FULL_OS runner list
This commit adds Debian 13 alias Trixie to the checked operating systems. The image needs to be run with UEFI support. Current Debian version overview: - Debian 11 (Bullseye) -> "oldoldstable" - Debian 12 (Bookworm) -> "oldstable" - Debian 13 (Trixie) -> new "stable" The CI will be run on Debian 12 and Debian 13 now. Debian 11 is kept, but won't be used automatically. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: George Melikov <mail@gmelikov.ru> Signed-off-by: Tino Reichardt <milky-zfs@mcmilk.de> Closes #17648
1 parent 8cca55f commit fdb5078

File tree

4 files changed

+29
-7
lines changed

4 files changed

+29
-7
lines changed

.github/workflows/scripts/qemu-2-start.sh

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ UBMIRROR="https://cloud-images.ubuntu.com"
2525
# default nic model for vm's
2626
NIC="virtio"
2727

28+
# additional options for virt-install
29+
OPTS[0]=""
30+
OPTS[1]=""
31+
2832
case "$OS" in
2933
almalinux8)
3034
OSNAME="AlmaLinux 8"
@@ -61,6 +65,14 @@ case "$OS" in
6165
OSNAME="Debian 12"
6266
URL="https://cloud.debian.org/images/cloud/bookworm/latest/debian-12-generic-amd64.qcow2"
6367
;;
68+
debian13)
69+
OSNAME="Debian 13"
70+
# TODO: Overwrite OSv to debian13 for virt-install until it's added to osinfo
71+
OSv="debian12"
72+
URL="https://cloud.debian.org/images/cloud/trixie/latest/debian-13-generic-amd64.qcow2"
73+
OPTS[0]="--boot"
74+
OPTS[1]="uefi=on"
75+
;;
6476
fedora41)
6577
OSNAME="Fedora 41"
6678
OSv="fedora-unknown"
@@ -242,7 +254,7 @@ sudo virt-install \
242254
--network bridge=virbr0,model=$NIC,mac='52:54:00:83:79:00' \
243255
--cloud-init user-data=/tmp/user-data \
244256
--disk $DISK,bus=virtio,cache=none,format=raw,driver.discard=unmap \
245-
--import --noautoconsole >/dev/null
257+
--import --noautoconsole ${OPTS[0]} ${OPTS[1]} >/dev/null
246258

247259
# Give the VMs hostnames so we don't have to refer to them with
248260
# hardcoded IP addresses.

.github/workflows/scripts/qemu-3-deps-vm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function debian() {
4141
libelf-dev libffi-dev libmount-dev libpam0g-dev libselinux-dev libssl-dev \
4242
libtool libtool-bin libudev-dev libunwind-dev linux-headers-$(uname -r) \
4343
lsscsi nfs-kernel-server pamtester parted python3 python3-all-dev \
44-
python3-cffi python3-dev python3-distlib python3-packaging \
44+
python3-cffi python3-dev python3-distlib python3-packaging libtirpc-dev \
4545
python3-setuptools python3-sphinx qemu-guest-agent rng-tools rpm2cpio \
4646
rsync samba sysstat uuid-dev watchdog wget xfslibs-dev xxhash zlib1g-dev
4747
echo "##[endgroup]"

.github/workflows/scripts/qemu-5-setup.sh

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,26 @@ source /var/tmp/env.txt
1212
# wait for poweroff to succeed
1313
PID=$(pidof /usr/bin/qemu-system-x86_64)
1414
tail --pid=$PID -f /dev/null
15-
sudo virsh undefine openzfs
15+
sudo virsh undefine --nvram openzfs
1616

1717
# cpu pinning
1818
CPUSET=("0,1" "2,3")
1919

20+
# additional options for virt-install
21+
OPTS[0]=""
22+
OPTS[1]=""
23+
2024
case "$OS" in
2125
freebsd*)
2226
# FreeBSD needs only 6GiB
2327
RAM=6
2428
;;
29+
debian13)
30+
RAM=8
31+
# Boot Debian 13 with uefi=on and secureboot=off (ZFS Kernel Module not signed)
32+
OPTS[0]="--boot"
33+
OPTS[1]="firmware=efi,firmware.feature0.name=secure-boot,firmware.feature0.enabled=no"
34+
;;
2535
*)
2636
# Linux needs more memory, but can be optimized to share it via KSM
2737
RAM=8
@@ -79,7 +89,7 @@ EOF
7989
--network bridge=virbr0,model=$NIC,mac="52:54:00:83:79:0$i" \
8090
--disk $DISK-system,bus=virtio,cache=none,format=$FORMAT,driver.discard=unmap \
8191
--disk $DISK-tests,bus=virtio,cache=none,format=$FORMAT,driver.discard=unmap \
82-
--import --noautoconsole >/dev/null
92+
--import --noautoconsole ${OPTS[0]} ${OPTS[1]}
8393
done
8494

8595
# generate some memory stats

.github/workflows/zfs-qemu.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Generate OS config and CI type
3030
id: os
3131
run: |
32-
FULL_OS='["almalinux8", "almalinux9", "almalinux10", "centos-stream9", "centos-stream10", "debian11", "debian12", "fedora41", "fedora42", "freebsd13-5r", "freebsd14-3s", "freebsd15-0c", "ubuntu22", "ubuntu24"]'
32+
FULL_OS='["almalinux8", "almalinux9", "almalinux10", "centos-stream9", "centos-stream10", "debian12", "debian13", "fedora41", "fedora42", "freebsd13-5r", "freebsd14-3s", "freebsd15-0c", "ubuntu22", "ubuntu24"]'
3333
QUICK_OS='["almalinux8", "almalinux9", "almalinux10", "debian12", "fedora42", "freebsd14-3s", "ubuntu24"]'
3434
# determine CI type when running on PR
3535
ci_type="full"
@@ -63,8 +63,8 @@ jobs:
6363
strategy:
6464
fail-fast: false
6565
matrix:
66-
# rhl: almalinux8, almalinux9, centos-stream9, fedora41
67-
# debian: debian11, debian12, ubuntu22, ubuntu24
66+
# rhl: almalinux8, almalinux9, centos-stream9, fedora4x
67+
# debian: debian12, debian13, ubuntu22, ubuntu24
6868
# misc: archlinux, tumbleweed
6969
# FreeBSD variants of 2025-06:
7070
# FreeBSD Release: freebsd13-5r, freebsd14-2r, freebsd14-3r

0 commit comments

Comments
 (0)