fix(test): reenable extended tests for Arch

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index e0fcf29559f483f21981ceaf47170c2d789d48be..5fe00d3a1473ae3c00051fbbcd29fee0bd956566 100644 (file)
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -142,6 +142,7 @@ jobs:
         strategy:
             matrix:
                 container: [
+                        "arch",
                         "debian",
                         "fedora",
                         "gentoo",

diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
index 69d11ae2aa856c970d207ba6ddd569d01b8d1139..57fc1e80bac07a11ff0ca00ed9b23be3104f80c7 100755 (executable)
--- a/test/TEST-12-RAID-DEG/test.sh
+++ b/test/TEST-12-RAID-DEG/test.sh
@@ -97,7 +97,8 @@ test_setup() {
     chmod 0600 /tmp/key
 
     test_dracut \
-        -m "crypt lvm mdraid" \
+        -a "crypt lvm mdraid" \
+        -o "systemd" \
         -i "./cryptroot-ask.sh" "/sbin/cryptroot-ask" \
         -i "/tmp/mdadm.conf" "/etc/mdadm.conf" \
         -i "/tmp/crypttab" "/etc/crypttab" \

diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh
index a1efefb24fa88650015c8690f28330e3ab8e7a17..51442726add2bd6e18b7732e79ff984fabf4b53e 100755 (executable)
--- a/test/TEST-14-IMSM/test.sh
+++ b/test/TEST-14-IMSM/test.sh
@@ -90,6 +90,8 @@ test_setup() {
     echo "$MD_UUID" > "$TESTDIR"/mduuid
 
     test_dracut \
+        -a "dmraid" \
+        -o "systemd" \
         "$TESTDIR"/initramfs.testing
 }
 

diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh
index 8f88de6e2140b9ad5b865cadcd4a5878bf792dc9..c003568320f11bb6fdcb0858e2e04aeefed7da3f 100755 (executable)
--- a/test/TEST-16-DMSQUASH/test.sh
+++ b/test/TEST-16-DMSQUASH/test.sh
@@ -128,14 +128,16 @@ SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="ntfs", ENV{ID_FS_TYPE}="ntfs3"
 EOF
 
     test_dracut \
-        --modules "dash dmsquash-live qemu" \
+        --add "dash dmsquash-live qemu" \
+        --omit "systemd" \
         --drivers "ntfs3" \
         --install "mkfs.ext4" \
         --include /tmp/ntfs3.rules /lib/udev/rules.d/ntfs3.rules \
         "$TESTDIR"/initramfs.testing
 
     test_dracut \
-        --modules "dmsquash-live-autooverlay qemu" \
+        --add "dmsquash-live-autooverlay qemu" \
+        --omit "systemd" \
         --install "mkfs.ext4" \
         "$TESTDIR"/initramfs.testing-autooverlay