Skip to content

Commit 6afb405

Browse files
authored
ZTS: Update FreeBSD version numbers
All defined variants: - freebsd13-4r, freebsd13-5r, freebsd14-1r, freebsd14-2r (RELEASE) - freebsd13-5s, freebsd14-2s (STABLE) - freebsd15-0c (CURRENT) Used for testing: - freebsd13-4r (RELEASE) - freebsd14-2s (STABLE) - freebsd15-0c (CURRENT) Reviewed-by: Alexander Motin <[email protected]> Signed-off-by: Tino Reichardt <[email protected]> Closes: #17260
1 parent 8f2c2de commit 6afb405

File tree

3 files changed

+19
-7
lines changed

3 files changed

+19
-7
lines changed

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

+17-6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ OSv=$OS
1414

1515
# compressed with .zst extension
1616
REPO="https://github.com/mcmilk/openzfs-freebsd-images"
17-
FREEBSD="$REPO/releases/download/v2024-12-14"
17+
FREEBSD="$REPO/releases/download/v2025-04-13"
1818
URLzs=""
1919

2020
# Ubuntu mirrors
@@ -37,8 +37,6 @@ case "$OS" in
3737
archlinux)
3838
OSNAME="Archlinux"
3939
URL="https://geo.mirror.pkgbuild.com/images/latest/Arch-Linux-x86_64-cloudimg.qcow2"
40-
# dns sometimes fails with that url :/
41-
echo "89.187.191.12 geo.mirror.pkgbuild.com" | sudo tee /etc/hosts > /dev/null
4240
;;
4341
centos-stream10)
4442
OSNAME="CentOS Stream 10"
@@ -80,16 +78,29 @@ case "$OS" in
8078
BASH="/usr/local/bin/bash"
8179
NIC="rtl8139"
8280
;;
81+
freebsd13-5r)
82+
OSNAME="FreeBSD 13.5-RELEASE"
83+
OSv="freebsd13.0"
84+
URLzs="$FREEBSD/amd64-freebsd-13.5-RELEASE.qcow2.zst"
85+
BASH="/usr/local/bin/bash"
86+
NIC="rtl8139"
87+
;;
88+
freebsd14-1r)
89+
OSNAME="FreeBSD 14.1-RELEASE"
90+
OSv="freebsd14.0"
91+
URLzs="$FREEBSD/amd64-freebsd-14.1-RELEASE.qcow2.zst"
92+
BASH="/usr/local/bin/bash"
93+
;;
8394
freebsd14-2r)
8495
OSNAME="FreeBSD 14.2-RELEASE"
8596
OSv="freebsd14.0"
8697
URLzs="$FREEBSD/amd64-freebsd-14.2-RELEASE.qcow2.zst"
8798
BASH="/usr/local/bin/bash"
8899
;;
89-
freebsd13-4s)
90-
OSNAME="FreeBSD 13.4-STABLE"
100+
freebsd13-5s)
101+
OSNAME="FreeBSD 13.5-STABLE"
91102
OSv="freebsd13.0"
92-
URLzs="$FREEBSD/amd64-freebsd-13.4-STABLE.qcow2.zst"
103+
URLzs="$FREEBSD/amd64-freebsd-13.5-STABLE.qcow2.zst"
93104
BASH="/usr/local/bin/bash"
94105
NIC="rtl8139"
95106
;;

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

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ function freebsd() {
5555
'^samba4[[:digit:]]+$' \
5656
'^py3[[:digit:]]+-cffi$' \
5757
'^py3[[:digit:]]+-sysctl$' \
58+
'^py3[[:digit:]]+-setuptools$' \
5859
'^py3[[:digit:]]+-packaging$'
5960
echo "##[endgroup]"
6061
}

.github/workflows/zfs-qemu.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Generate OS config and CI type
3535
id: os
3636
run: |
37-
FULL_OS='["almalinux8", "almalinux9", "debian11", "debian12", "fedora40", "fedora41", "fedora42", "freebsd13-4r", "freebsd14-2r", "freebsd15-0c", "ubuntu20", "ubuntu22", "ubuntu24"]'
37+
FULL_OS='["almalinux8", "almalinux9", "debian11", "debian12", "fedora40", "fedora41", "fedora42", "freebsd13-4r", "freebsd14-2s", "freebsd15-0c", "ubuntu20", "ubuntu22", "ubuntu24"]'
3838
QUICK_OS='["almalinux8", "almalinux9", "debian12", "fedora42", "freebsd14-2r", "ubuntu24"]'
3939
# determine CI type when running on PR
4040
ci_type="full"

0 commit comments

Comments
 (0)