From ba03054c83f4e36a4dda86707fe12d422d05fdad Mon Sep 17 00:00:00 2001 From: Tony Hutter Date: Wed, 16 Apr 2025 17:00:59 -0700 Subject: [PATCH] CI: Add Fedora 42 runner (#17249) Signed-off-by: Tony Hutter Reviewed-by: Tino Reichardt Reviewed-by: George Melikov Reviewed-by: Alexander Motin --- .github/workflows/scripts/qemu-2-start.sh | 5 +++++ .github/workflows/scripts/qemu-3-deps-vm.sh | 3 +++ .github/workflows/zfs-qemu-packages.yml | 2 +- .github/workflows/zfs-qemu.yml | 4 ++-- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/scripts/qemu-2-start.sh b/.github/workflows/scripts/qemu-2-start.sh index bd2aa5dc1..f8170e85b 100755 --- a/.github/workflows/scripts/qemu-2-start.sh +++ b/.github/workflows/scripts/qemu-2-start.sh @@ -68,6 +68,11 @@ case "$OS" in OSv="fedora-unknown" URL="https://download.fedoraproject.org/pub/fedora/linux/releases/41/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-41-1.4.x86_64.qcow2" ;; + fedora42) + OSNAME="Fedora 42" + OSv="fedora-unknown" + URL="https://download.fedoraproject.org/pub/fedora/linux/releases/42/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-42-1.1.x86_64.qcow2" + ;; freebsd13-4r) OSNAME="FreeBSD 13.4-RELEASE" OSv="freebsd13.0" diff --git a/.github/workflows/scripts/qemu-3-deps-vm.sh b/.github/workflows/scripts/qemu-3-deps-vm.sh index 9bd86b5ba..6605ab49c 100755 --- a/.github/workflows/scripts/qemu-3-deps-vm.sh +++ b/.github/workflows/scripts/qemu-3-deps-vm.sh @@ -129,6 +129,9 @@ case "$1" in fedora*) rhel sudo dnf install -y libunwind-devel + + # Fedora 42+ moves /usr/bin/script from 'util-linux' to 'util-linux-script' + sudo dnf install -y util-linux-script || true ;; freebsd*) freebsd diff --git a/.github/workflows/zfs-qemu-packages.yml b/.github/workflows/zfs-qemu-packages.yml index e4dd29581..a1c593972 100644 --- a/.github/workflows/zfs-qemu-packages.yml +++ b/.github/workflows/zfs-qemu-packages.yml @@ -47,7 +47,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['almalinux8', 'almalinux9', 'fedora40', 'fedora41'] + os: ['almalinux8', 'almalinux9', 'fedora40', 'fedora41', 'fedora42'] runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/zfs-qemu.yml b/.github/workflows/zfs-qemu.yml index a0939dd8c..34b59cda5 100644 --- a/.github/workflows/zfs-qemu.yml +++ b/.github/workflows/zfs-qemu.yml @@ -34,8 +34,8 @@ jobs: - name: Generate OS config and CI type id: os run: | - FULL_OS='["almalinux8", "almalinux9", "debian11", "debian12", "fedora40", "fedora41", "freebsd13-4r", "freebsd14-2r", "freebsd15-0c", "ubuntu20", "ubuntu22", "ubuntu24"]' - QUICK_OS='["almalinux8", "almalinux9", "debian12", "fedora41", "freebsd14-2r", "ubuntu24"]' + FULL_OS='["almalinux8", "almalinux9", "debian11", "debian12", "fedora40", "fedora41", "fedora42", "freebsd13-4r", "freebsd14-2r", "freebsd15-0c", "ubuntu20", "ubuntu22", "ubuntu24"]' + QUICK_OS='["almalinux8", "almalinux9", "debian12", "fedora42", "freebsd14-2r", "ubuntu24"]' # determine CI type when running on PR ci_type="full" if ${{ github.event_name == 'pull_request' }}; then