Skip to content

Commit 830a531

Browse files
authored
CI: Add FreeBSD 14.2 RELEASE+STABLE builds
Update the CI to include FreeBSD 14.2 as a regularly tested platform. Reviewed-by: Tino Reichardt <[email protected]> Reviewed-by: Alexander Motin <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes openzfs#16869
1 parent 882a809 commit 830a531

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

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

Lines changed: 10 additions & 10 deletions
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-10-05"
17+
FREEBSD="$REPO/releases/download/v2024-12-14"
1818
URLzs=""
1919

2020
# Ubuntu mirrors
@@ -76,28 +76,28 @@ case "$OS" in
7676
BASH="/usr/local/bin/bash"
7777
NIC="rtl8139"
7878
;;
79-
freebsd14-0r)
80-
OSNAME="FreeBSD 14.0-RELEASE"
81-
OSv="freebsd14.0"
82-
URLzs="$FREEBSD/amd64-freebsd-14.0-RELEASE.qcow2.zst"
83-
BASH="/usr/local/bin/bash"
84-
;;
8579
freebsd14-1r)
8680
OSNAME="FreeBSD 14.1-RELEASE"
8781
OSv="freebsd14.0"
8882
URLzs="$FREEBSD/amd64-freebsd-14.1-RELEASE.qcow2.zst"
8983
BASH="/usr/local/bin/bash"
9084
;;
85+
freebsd14-2r)
86+
OSNAME="FreeBSD 14.2-RELEASE"
87+
OSv="freebsd14.0"
88+
URLzs="$FREEBSD/amd64-freebsd-14.2-RELEASE.qcow2.zst"
89+
BASH="/usr/local/bin/bash"
90+
;;
9191
freebsd13-4s)
9292
OSNAME="FreeBSD 13.4-STABLE"
9393
OSv="freebsd13.0"
9494
URLzs="$FREEBSD/amd64-freebsd-13.4-STABLE.qcow2.zst"
9595
BASH="/usr/local/bin/bash"
9696
;;
97-
freebsd14-1s)
98-
OSNAME="FreeBSD 14.1-STABLE"
97+
freebsd14-2s)
98+
OSNAME="FreeBSD 14.2-STABLE"
9999
OSv="freebsd14.0"
100-
URLzs="$FREEBSD/amd64-freebsd-14.1-STABLE.qcow2.zst"
100+
URLzs="$FREEBSD/amd64-freebsd-14.2-STABLE.qcow2.zst"
101101
BASH="/usr/local/bin/bash"
102102
;;
103103
freebsd15-0c)

.github/workflows/zfs-qemu.yml

Lines changed: 5 additions & 4 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", "fedora40", "fedora41", "freebsd13-4r", "freebsd14-0r", "freebsd14-1s", "ubuntu20", "ubuntu22", "ubuntu24"]'
26-
QUICK_OS='["almalinux8", "almalinux9", "debian12", "fedora41", "freebsd13-3r", "freebsd14-1r", "ubuntu24"]'
25+
FULL_OS='["almalinux8", "almalinux9", "centos-stream9", "debian11", "debian12", "fedora40", "fedora41", "freebsd13-3r", "freebsd13-4s", "freebsd14-1r", "freebsd14-2s", "freebsd15-0c", "ubuntu20", "ubuntu22", "ubuntu24"]'
26+
QUICK_OS='["almalinux8", "almalinux9", "debian12", "fedora41", "freebsd13-3r", "freebsd14-2r", "ubuntu24"]'
2727
# determine CI type when running on PR
2828
ci_type="full"
2929
if ${{ github.event_name == 'pull_request' }}; then
@@ -49,8 +49,9 @@ jobs:
4949
# rhl: almalinux8, almalinux9, centos-stream9, fedora40, fedora41
5050
# debian: debian11, debian12, ubuntu20, ubuntu22, ubuntu24
5151
# misc: archlinux, tumbleweed
52-
# FreeBSD Release: freebsd13-3r, freebsd13-4r, freebsd14-0r, freebsd14-1r
53-
# FreeBSD Stable: freebsd13-4s, freebsd14-1s
52+
# FreeBSD variants of 2024-12:
53+
# FreeBSD Release: freebsd13-3r, freebsd13-4r, freebsd14-1r, freebsd14-2r
54+
# FreeBSD Stable: freebsd13-4s, freebsd14-2s
5455
# FreeBSD Current: freebsd15-0c
5556
os: ${{ fromJson(needs.test-config.outputs.test_os) }}
5657
runs-on: ubuntu-24.04

0 commit comments

Comments
 (0)