From ca5a4e516cd835dd2e1660f142878bbfeb9a146f Mon Sep 17 00:00:00 2001 From: Alan Somers Date: Wed, 3 Dec 2025 12:44:17 -0700 Subject: [PATCH] Use FreeBSD 15.0-RELEASE in CI And remove the obsolete FreeBSD 14.2-RELEASE. Sponsored by: ConnectWise Signed-off-by: Alan Somers --- .github/workflows/scripts/qemu-2-start.sh | 14 +++++++------- .github/workflows/zfs-qemu.yml | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/scripts/qemu-2-start.sh b/.github/workflows/scripts/qemu-2-start.sh index 5bdd84ca2435..847dae1352b8 100755 --- a/.github/workflows/scripts/qemu-2-start.sh +++ b/.github/workflows/scripts/qemu-2-start.sh @@ -95,13 +95,6 @@ case "$OS" in KSRC="$FREEBSD_REL/../amd64/$FreeBSD/src.txz" NIC="rtl8139" ;; - freebsd14-2r) - FreeBSD="14.2-RELEASE" - OSNAME="FreeBSD $FreeBSD" - OSv="freebsd14.0" - URLxz="$FREEBSD_REL/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI.raw.xz" - KSRC="$FREEBSD_REL/../amd64/$FreeBSD/src.txz" - ;; freebsd14-3r) FreeBSD="14.3-RELEASE" OSNAME="FreeBSD $FreeBSD" @@ -124,6 +117,13 @@ case "$OS" in URLxz="$FREEBSD_SNAP/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI-ufs.raw.xz" KSRC="$FREEBSD_SNAP/../amd64/$FreeBSD/src.txz" ;; + freebsd15-0r) + FreeBSD="15.0-RELEASE" + OSNAME="FreeBSD $FreeBSD" + OSv="freebsd14.0" + URLxz="$FREEBSD_REL/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI-ufs.raw.xz" + KSRC="$FREEBSD_REL/../amd64/$FreeBSD/src.txz" + ;; freebsd15-0s) FreeBSD="15.0-STABLE" OSNAME="FreeBSD $FreeBSD" diff --git a/.github/workflows/zfs-qemu.yml b/.github/workflows/zfs-qemu.yml index dad7611cf1a9..f17fcd8ed4fe 100644 --- a/.github/workflows/zfs-qemu.yml +++ b/.github/workflows/zfs-qemu.yml @@ -40,17 +40,17 @@ jobs: case "$ci_type" in quick) - os_selection='["almalinux8", "almalinux9", "almalinux10", "debian12", "fedora42", "freebsd15-0s", "ubuntu24"]' + os_selection='["almalinux8", "almalinux9", "almalinux10", "debian12", "fedora42", "freebsd15-0r", "ubuntu24"]' ;; linux) os_selection='["almalinux8", "almalinux9", "almalinux10", "centos-stream9", "centos-stream10", "debian11", "debian12", "debian13", "fedora41", "fedora42", "fedora43", "ubuntu22", "ubuntu24"]' ;; freebsd) - os_selection='["freebsd13-5r", "freebsd14-2r", "freebsd14-3r", "freebsd13-5s", "freebsd14-3s", "freebsd15-0s", "freebsd16-0c"]' + os_selection='["freebsd13-5r", "freebsd14-3r", "freebsd13-5s", "freebsd14-3s", "freebsd15-0r", "freebsd15-0s", "freebsd16-0c"]' ;; *) # default list - os_selection='["almalinux8", "almalinux9", "almalinux10", "centos-stream9", "centos-stream10", "debian12", "debian13", "fedora42", "fedora43", "freebsd14-3r", "freebsd15-0s", "freebsd16-0c", "ubuntu22", "ubuntu24"]' + os_selection='["almalinux8", "almalinux9", "almalinux10", "centos-stream9", "centos-stream10", "debian12", "debian13", "fedora42", "fedora43", "freebsd14-3r", "freebsd15-0r", "freebsd16-0c", "ubuntu22", "ubuntu24"]' ;; esac @@ -76,7 +76,7 @@ jobs: # debian: debian12, debian13, ubuntu22, ubuntu24 # misc: archlinux, tumbleweed # FreeBSD variants of november 2025: - # FreeBSD Release: freebsd13-5r, freebsd14-2r, freebsd14-3r + # FreeBSD Release: freebsd13-5r, freebsd14-3r, freebsd15-0r # FreeBSD Stable: freebsd13-5s, freebsd14-3s, freebsd15-0s # FreeBSD Current: freebsd16-0c os: ${{ fromJson(needs.test-config.outputs.test_os) }}