Skip to content

Commit a93aca7

Browse files
committed
ZTS: Add AlmaLinux 10
Signed-off-by: Tino Reichardt <[email protected]>
1 parent 3dfa98d commit a93aca7

File tree

6 files changed

+12
-6
lines changed

6 files changed

+12
-6
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ case "$OS" in
3434
OSNAME="AlmaLinux 9"
3535
URL="https://repo.almalinux.org/almalinux/9/cloud/x86_64/images/AlmaLinux-9-GenericCloud-latest.x86_64.qcow2"
3636
;;
37+
almalinux10)
38+
OSNAME="AlmaLinux 10"
39+
OSv="almalinux9"
40+
URL="https://repo.almalinux.org/almalinux/10/cloud/x86_64/images/AlmaLinux-10-GenericCloud-latest.x86_64.qcow2"
41+
;;
3742
archlinux)
3843
OSNAME="Archlinux"
3944
URL="https://geo.mirror.pkgbuild.com/images/latest/Arch-Linux-x86_64-cloudimg.qcow2"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ case "$1" in
128128
sudo dnf install -y kernel-abi-whitelists
129129
echo "##[endgroup]"
130130
;;
131-
almalinux9|centos-stream9|centos-stream10)
131+
almalinux9|almalinux10|centos-stream9|centos-stream10)
132132
echo "##[group]Enable epel and crb repositories"
133133
sudo dnf config-manager -y --set-enabled crb
134134
sudo dnf install -y epel-release

.github/workflows/zfs-qemu-packages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
strategy:
4848
fail-fast: false
4949
matrix:
50-
os: ['almalinux8', 'almalinux9', 'fedora40', 'fedora41', 'fedora42']
50+
os: ['almalinux8', 'almalinux9', 'almalinux10', 'fedora40', 'fedora41', 'fedora42']
5151
runs-on: ubuntu-24.04
5252
steps:
5353
- uses: actions/checkout@v4

.github/workflows/zfs-qemu.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ jobs:
3939
- name: Generate OS config and CI type
4040
id: os
4141
run: |
42-
FULL_OS='["almalinux8", "almalinux9", "debian11", "debian12", "fedora40", "fedora41", "fedora42", "freebsd13-4r", "freebsd14-2s", "freebsd15-0c", "ubuntu20", "ubuntu22", "ubuntu24"]'
43-
QUICK_OS='["almalinux8", "almalinux9", "debian12", "fedora42", "freebsd14-2r", "ubuntu24"]'
42+
FULL_OS='["almalinux8", "almalinux9", "almalinux10", "debian11", "debian12", "fedora40", "fedora41", "fedora42", "freebsd13-4r", "freebsd14-2s", "freebsd15-0c", "ubuntu20", "ubuntu22", "ubuntu24"]'
43+
QUICK_OS='["almalinux8", "almalinux9", "almalinux10", "debian12", "fedora42", "freebsd14-2r", "ubuntu24"]'
4444
# determine CI type when running on PR
4545
ci_type="full"
4646
if ${{ github.event_name == 'pull_request' }}; then

tests/zfs-tests/tests/functional/direct/dio_async_fio_ioengines.ksh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ if is_linux; then
6767
if $(grep -q "CONFIG_IO_URING=y" /boot/config-$(uname -r)); then
6868
if [ -e /etc/os-release ] ; then
6969
source /etc/os-release
70-
if [ $PLATFORM_ID = "platform:el9" ] ; then
70+
if [ "$PLATFORM_ID" = "platform:el9" ] || \
71+
[ "$PLATFORM_ID" = "platform:el10" ] ; then
7172
log_note "io_uring disabled on RHEL 9 " \
7273
"variants: fails with " \
7374
"'Operation not permitted'"

tests/zfs-tests/tests/functional/io/io_uring.ksh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ fi
4747

4848
if [ -e /etc/os-release ] ; then
4949
source /etc/os-release
50-
if [ $PLATFORM_ID = "platform:el9" ]; then
50+
if [ "$PLATFORM_ID" = "platform:el9" ] || [ "$PLATFORM_ID" = "platform:el10" ] ; then
5151
log_unsupported "Disabled on RHEL 9 variants: fails with 'Operation not permitted'"
5252
fi
5353
fi

0 commit comments

Comments
 (0)