From 4970b969498da86633e7203e0bcc766891a78bf2 Mon Sep 17 00:00:00 2001 From: Tom Hesse Date: Fri, 25 Jul 2025 19:31:34 +0200 Subject: [PATCH 1/5] Use correct kernel name for zfs kernel modules --- tests/integration/targets/zpool/aliases | 1 - .../targets/zpool/tasks/install_requirements_alpine.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/integration/targets/zpool/aliases b/tests/integration/targets/zpool/aliases index 083656f786..80743b7cb5 100644 --- a/tests/integration/targets/zpool/aliases +++ b/tests/integration/targets/zpool/aliases @@ -12,4 +12,3 @@ skip/osx skip/macos skip/rhel skip/docker -skip/alpine # TODO: figure out what goes wrong diff --git a/tests/integration/targets/zpool/tasks/install_requirements_alpine.yml b/tests/integration/targets/zpool/tasks/install_requirements_alpine.yml index a734ed4616..296225f689 100644 --- a/tests/integration/targets/zpool/tasks/install_requirements_alpine.yml +++ b/tests/integration/targets/zpool/tasks/install_requirements_alpine.yml @@ -7,7 +7,7 @@ community.general.apk: name: - zfs - - zfs-lts + - "zfs-{{ ansible_kernel.split('-')[-1] }}" - name: Load zfs module community.general.modprobe: From e183bf08fc46163ce11f6ca7fb7075b292c3a534 Mon Sep 17 00:00:00 2001 From: Tom Hesse Date: Fri, 25 Jul 2025 20:12:44 +0200 Subject: [PATCH 2/5] Remove modprobe task to check if testing works without it --- .../targets/zpool/tasks/install_requirements_alpine.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/integration/targets/zpool/tasks/install_requirements_alpine.yml b/tests/integration/targets/zpool/tasks/install_requirements_alpine.yml index 296225f689..dbcfab4227 100644 --- a/tests/integration/targets/zpool/tasks/install_requirements_alpine.yml +++ b/tests/integration/targets/zpool/tasks/install_requirements_alpine.yml @@ -8,8 +8,3 @@ name: - zfs - "zfs-{{ ansible_kernel.split('-')[-1] }}" - -- name: Load zfs module - community.general.modprobe: - name: zfs - state: present From 35378901781d0f51d453c7a3c7b6b638f5ef3035 Mon Sep 17 00:00:00 2001 From: Tom Hesse Date: Fri, 25 Jul 2025 20:34:48 +0200 Subject: [PATCH 3/5] Revert "Remove modprobe task to check if testing works without it" This reverts commit e183bf08fc46163ce11f6ca7fb7075b292c3a534. --- .../targets/zpool/tasks/install_requirements_alpine.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/integration/targets/zpool/tasks/install_requirements_alpine.yml b/tests/integration/targets/zpool/tasks/install_requirements_alpine.yml index dbcfab4227..296225f689 100644 --- a/tests/integration/targets/zpool/tasks/install_requirements_alpine.yml +++ b/tests/integration/targets/zpool/tasks/install_requirements_alpine.yml @@ -8,3 +8,8 @@ name: - zfs - "zfs-{{ ansible_kernel.split('-')[-1] }}" + +- name: Load zfs module + community.general.modprobe: + name: zfs + state: present From 6f005e9564b279cfb97d68ee25f2b48318ca400e Mon Sep 17 00:00:00 2001 From: Tom Hesse Date: Sat, 26 Jul 2025 08:42:12 +0200 Subject: [PATCH 4/5] Add debug task --- .../targets/zpool/tasks/install_requirements_alpine.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/integration/targets/zpool/tasks/install_requirements_alpine.yml b/tests/integration/targets/zpool/tasks/install_requirements_alpine.yml index 296225f689..0e7134129c 100644 --- a/tests/integration/targets/zpool/tasks/install_requirements_alpine.yml +++ b/tests/integration/targets/zpool/tasks/install_requirements_alpine.yml @@ -9,6 +9,9 @@ - zfs - "zfs-{{ ansible_kernel.split('-')[-1] }}" +- name: Check content of /lib/modules/6.12.38-0-virt/ + ansible.builtin.command: ls -l /lib/modules/6.12.38-0-virt/ + - name: Load zfs module community.general.modprobe: name: zfs From a0d0b68b01a889949574ce80e0d11a90a6d078ea Mon Sep 17 00:00:00 2001 From: Tom Hesse Date: Sat, 26 Jul 2025 08:48:46 +0200 Subject: [PATCH 5/5] Revert "Add debug task" This reverts commit 6f005e9564b279cfb97d68ee25f2b48318ca400e. --- .../targets/zpool/tasks/install_requirements_alpine.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/integration/targets/zpool/tasks/install_requirements_alpine.yml b/tests/integration/targets/zpool/tasks/install_requirements_alpine.yml index 0e7134129c..296225f689 100644 --- a/tests/integration/targets/zpool/tasks/install_requirements_alpine.yml +++ b/tests/integration/targets/zpool/tasks/install_requirements_alpine.yml @@ -9,9 +9,6 @@ - zfs - "zfs-{{ ansible_kernel.split('-')[-1] }}" -- name: Check content of /lib/modules/6.12.38-0-virt/ - ansible.builtin.command: ls -l /lib/modules/6.12.38-0-virt/ - - name: Load zfs module community.general.modprobe: name: zfs