Skip to content

Commit 092f7d7

Browse files
committed
ZTS: Add Fedora 41, remove Fedora 39
Fedora 41 was released 10/29/24, and Fedora 39 will be EOL on 11/12/24. Update Fedora runners in the test suite. Signed-off-by: Tony Hutter <[email protected]> ZFS-CI-Type: full
1 parent e5d1f68 commit 092f7d7

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@ case "$OS" in
5252
OSNAME="Debian 12"
5353
URL="https://cloud.debian.org/images/cloud/bookworm/latest/debian-12-generic-amd64.qcow2"
5454
;;
55-
fedora39)
56-
OSNAME="Fedora 39"
57-
OSv="fedora39"
58-
URL="https://download.fedoraproject.org/pub/fedora/linux/releases/39/Cloud/x86_64/images/Fedora-Cloud-Base-39-1.5.x86_64.qcow2"
59-
;;
6055
fedora40)
6156
OSNAME="Fedora 40"
62-
OSv="fedora39"
57+
OSv="fedora-unknown"
6358
URL="https://download.fedoraproject.org/pub/fedora/linux/releases/40/Cloud/x86_64/images/Fedora-Cloud-Base-Generic.x86_64-40-1.14.qcow2"
6459
;;
60+
fedora41)
61+
OSNAME="Fedora 41"
62+
OSv="fedora-unknown"
63+
URL="https://download.fedoraproject.org/pub/fedora/linux/releases/41/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-41-1.4.x86_64.qcow2"
64+
;;
6565
freebsd13-3r)
6666
OSNAME="FreeBSD 13.3-RELEASE"
6767
OSv="freebsd13.0"

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,10 @@ function rhel() {
6666
echo "##[endgroup]"
6767

6868
echo "##[group]Install Development Tools"
69-
sudo dnf group install -y "Development Tools"
69+
70+
# Fedora 41 likes "development-tools" over "Development Tools"
71+
sudo dnf group install -y development-tools
72+
7073
sudo dnf install -y \
7174
acl attr bc bzip2 cryptsetup curl dbench dkms elfutils-libelf-devel fio \
7275
gdb git jq kernel-rpm-macros ksh libacl-devel libaio-devel \

.github/workflows/scripts/qemu-4-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ function rpm_build_and_install() {
8383
echo "##[endgroup]"
8484

8585
echo "##[group]Install"
86-
run sudo dnf -y --skip-broken localinstall $(ls *.rpm | grep -v src.rpm)
86+
run sudo dnf -y --nobest install $(ls *.rpm | grep -v src.rpm)
8787
echo "##[endgroup]"
8888

8989
}

.github/workflows/zfs-qemu.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
- name: Generate OS config and CI type
2323
id: os
2424
run: |
25-
FULL_OS='["almalinux8", "almalinux9", "centos-stream9", "debian11", "debian12", "fedora39", "fedora40", "freebsd13-4r", "freebsd14-0r", "freebsd14-1s", "ubuntu20", "ubuntu22", "ubuntu24"]'
26-
QUICK_OS='["almalinux8", "almalinux9", "debian12", "fedora40", "freebsd13-3r", "freebsd14-1r", "ubuntu24"]'
25+
FULL_OS='["almalinux8", "almalinux9", "centos-stream9", "debian11", "debian12", "fedora40", "fedora41", "freebsd13-4r", "freebsd14-0r", "freebsd14-1s", "ubuntu20", "ubuntu22", "ubuntu24"]'
26+
QUICK_OS='["almalinux8", "almalinux9", "debian12", "fedora41", "freebsd13-3r", "freebsd14-1r", "ubuntu24"]'
2727
# determine CI type when running on PR
2828
ci_type="full"
2929
if ${{ github.event_name == 'pull_request' }}; then
@@ -46,7 +46,7 @@ jobs:
4646
strategy:
4747
fail-fast: false
4848
matrix:
49-
# rhl: almalinux8, almalinux9, centos-stream9, fedora39, fedora40
49+
# rhl: almalinux8, almalinux9, centos-stream9, fedora40, fedora41
5050
# debian: debian11, debian12, ubuntu20, ubuntu22, ubuntu24
5151
# misc: archlinux, tumbleweed
5252
# FreeBSD Release: freebsd13-3r, freebsd13-4r, freebsd14-0r, freebsd14-1r

0 commit comments

Comments
 (0)