Skip to content

Commit 46d2516

Browse files
committed
ZTS: add centos stream10
Added centos as optional runners via workflow_dispatch removed centos-stream9 from the FULL_OS runner list as CentOS is not officially support by ZFS. This commit will add preliminary support for EL10 and allow testing ZFS ahead of EL10 codebase solidifying in ~6 months Signed-off-by: James Reilly <[email protected]>
1 parent 1acd246 commit 46d2516

File tree

3 files changed

+33
-2
lines changed

3 files changed

+33
-2
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ case "$OS" in
4040
# dns sometimes fails with that url :/
4141
echo "89.187.191.12 geo.mirror.pkgbuild.com" | sudo tee /etc/hosts > /dev/null
4242
;;
43+
centos-stream10)
44+
OSNAME="CentOS Stream 10"
45+
# TODO: #16903 Overwrite OSv to stream9 for virt-install until it's added to osinfo
46+
OSv="centos-stream9"
47+
URL="https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-GenericCloud-10-latest.x86_64.qcow2"
48+
;;
4349
centos-stream9)
4450
OSNAME="CentOS Stream 9"
4551
URL="https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ case "$1" in
104104
sudo dnf install -y kernel-abi-whitelists
105105
echo "##[endgroup]"
106106
;;
107-
almalinux9|centos-stream9)
107+
almalinux9|centos-stream9|centos-stream10)
108108
echo "##[group]Enable epel and crb repositories"
109109
sudo dnf config-manager -y --set-enabled crb
110110
sudo dnf install -y epel-release

.github/workflows/zfs-qemu.yml

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,18 @@ name: zfs-qemu
33
on:
44
push:
55
pull_request:
6+
workflow_dispatch:
7+
inputs:
8+
include_stream9:
9+
type: boolean
10+
required: false
11+
default: false
12+
description: 'Test on CentOS 9 stream'
13+
include_stream10:
14+
type: boolean
15+
required: false
16+
default: false
17+
description: 'Test on CentOS 10 stream'
618

719
concurrency:
820
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -22,7 +34,7 @@ jobs:
2234
- name: Generate OS config and CI type
2335
id: os
2436
run: |
25-
FULL_OS='["almalinux8", "almalinux9", "centos-stream9", "debian11", "debian12", "fedora40", "fedora41", "freebsd13-3r", "freebsd13-4s", "freebsd14-1r", "freebsd14-2s", "freebsd15-0c", "ubuntu20", "ubuntu22", "ubuntu24"]'
37+
FULL_OS='["almalinux8", "almalinux9", "debian11", "debian12", "fedora40", "fedora41", "freebsd13-3r", "freebsd13-4s", "freebsd14-1r", "freebsd14-2s", "freebsd15-0c", "ubuntu20", "ubuntu22", "ubuntu24"]'
2638
QUICK_OS='["almalinux8", "almalinux9", "debian12", "fedora41", "freebsd13-3r", "freebsd14-2r", "ubuntu24"]'
2739
# determine CI type when running on PR
2840
ci_type="full"
@@ -37,9 +49,22 @@ jobs:
3749
os_selection="$FULL_OS"
3850
fi
3951
os_json=$(echo ${os_selection} | jq -c)
52+
53+
# Add optional runners
54+
if [ "${{ github.event.inputs.include_stream9 }}" == 'true' ]; then
55+
os_json=$(echo $os_json | jq -c '. += ["centos-stream9"]')
56+
fi
57+
if [ "${{ github.event.inputs.include_stream10 }}" == 'true' ]; then
58+
os_json=$(echo $os_json | jq -c '. += ["centos-stream10"]')
59+
fi
60+
61+
echo $os_json
4062
echo "os=$os_json" >> $GITHUB_OUTPUT
4163
echo "ci_type=$ci_type" >> $GITHUB_OUTPUT
4264
65+
66+
67+
4368
qemu-vm:
4469
name: qemu-x86
4570
needs: [ test-config ]

0 commit comments

Comments
 (0)