Skip to content

ZTS: Add AlmaLinux 10 #17397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/scripts/qemu-2-start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ case "$OS" in
OSNAME="AlmaLinux 9"
URL="https://repo.almalinux.org/almalinux/9/cloud/x86_64/images/AlmaLinux-9-GenericCloud-latest.x86_64.qcow2"
;;
almalinux10)
OSNAME="AlmaLinux 10"
OSv="almalinux9"
URL="https://repo.almalinux.org/almalinux/10/cloud/x86_64/images/AlmaLinux-10-GenericCloud-latest.x86_64.qcow2"
;;
archlinux)
OSNAME="Archlinux"
URL="https://geo.mirror.pkgbuild.com/images/latest/Arch-Linux-x86_64-cloudimg.qcow2"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scripts/qemu-3-deps-vm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ case "$1" in
sudo dnf install -y kernel-abi-whitelists
echo "##[endgroup]"
;;
almalinux9|centos-stream9|centos-stream10)
almalinux9|almalinux10|centos-stream9|centos-stream10)
echo "##[group]Enable epel and crb repositories"
sudo dnf config-manager -y --set-enabled crb
sudo dnf install -y epel-release
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/scripts/qemu-6-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,13 @@ case "$1" in
;;
esac

# enable io_uring on el9/el10
case "$1" in
almalinux9|almalinux10)
sudo sysctl kernel.io_uring_disabled=0 > /dev/null
;;
esac

# run functional testings and save exitcode
cd /var/tmp
TAGS=$2/$3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zfs-qemu-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ['almalinux8', 'almalinux9', 'fedora40', 'fedora41', 'fedora42']
os: ['almalinux8', 'almalinux9', 'almalinux10', 'fedora40', 'fedora41', 'fedora42']
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/zfs-qemu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ jobs:
- name: Generate OS config and CI type
id: os
run: |
FULL_OS='["almalinux8", "almalinux9", "debian11", "debian12", "fedora40", "fedora41", "fedora42", "freebsd13-4r", "freebsd14-2s", "freebsd15-0c", "ubuntu22", "ubuntu24"]'
QUICK_OS='["almalinux8", "almalinux9", "debian12", "fedora42", "freebsd14-2r", "ubuntu24"]'
FULL_OS='["almalinux8", "almalinux9", "almalinux10", "debian11", "debian12", "fedora40", "fedora41", "fedora42", "freebsd13-4r", "freebsd14-2s", "freebsd15-0c", "ubuntu22", "ubuntu24"]'
QUICK_OS='["almalinux8", "almalinux9", "almalinux10", "debian12", "fedora42", "freebsd14-2r", "ubuntu24"]'
# determine CI type when running on PR
ci_type="full"
if ${{ github.event_name == 'pull_request' }}; then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,26 +65,11 @@ fio_async_ioengines="posixaio"
if is_linux; then
fio_async_ioengines+=" libaio"
if $(grep -q "CONFIG_IO_URING=y" /boot/config-$(uname -r)); then
if [ -e /etc/os-release ] ; then
source /etc/os-release
if [ $PLATFORM_ID = "platform:el9" ] ; then
log_note "io_uring disabled on RHEL 9 " \
"variants: fails with " \
"'Operation not permitted'"
elif $(check_fio_ioengine -eq 0); then
fio_async_ioengines+=" io_uring"
else
log_note "io_uring not supported by fio and " \
"will not be tested"
fi
else
if $(check_fio_ioengine); then
fio_async_ioengines+=" io_uring"

else
log_note "io_uring not supported by fio and " \
"will not be tested"
fi
if $(check_fio_ioengine); then
fio_async_ioengines+=" io_uring"
else
log_note "io_uring not supported by fio and " \
"will not be tested"
fi
else
log_note "io_uring not supported by kernel will not " \
Expand Down
7 changes: 0 additions & 7 deletions tests/zfs-tests/tests/functional/io/io_uring.ksh
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,6 @@ if ! $(grep -q "CONFIG_IO_URING=y" /boot/config-$(uname -r)); then
log_unsupported "Requires io_uring support within Kernel"
fi

if [ -e /etc/os-release ] ; then
source /etc/os-release
if [ $PLATFORM_ID = "platform:el9" ]; then
log_unsupported "Disabled on RHEL 9 variants: fails with 'Operation not permitted'"
fi
fi

fio --ioengine=io_uring --parse-only || log_unsupported "fio io_uring support required"

function cleanup
Expand Down
Loading