test: drop requiring iscsiuio.socket

The iscsiuio socket/service is only needed on specific hardware. It is
not needed for the ISCSI and ISCSI-MULTI test cases. Without this check
the tests will succeed on Debian and Ubuntu.

Fixes: https://github.com/dracut-ng/dracut-ng/issues/446

diff --git a/.github/workflows/integration-extra.yml b/.github/workflows/integration-extra.yml
index 594ec33fede5b7a98bf491c553f9ec4ca43728ad..61eb00a8ab2529662d814747a14c8068255b2c5f 100644 (file)
--- a/.github/workflows/integration-extra.yml
+++ b/.github/workflows/integration-extra.yml
@@ -128,13 +128,6 @@ jobs:
                     - "70"
                     - "71"
                     - "72"
-                exclude:
-                    # https://github.com/dracut-ng/dracut-ng/issues/446
-                    - container: debian:sid
-                      test: "70"
-                    # https://github.com/dracut-ng/dracut-ng/issues/446
-                    - container: debian:sid
-                      test: "71"
         container:
             image: ghcr.io/dracut-ng/${{ matrix.container }}-amd
             options: '--device=/dev/kvm'

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 240d1d29f6bdfc79eecbc77f5e0fb2de11de6933..a88649b3f7fc048a4bfac9914bf262a24d708adb 100644 (file)
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -198,11 +198,17 @@ jobs:
             matrix:
                 container:
                     - arch:latest
+                    - debian:latest
                     - opensuse:latest
+                    - ubuntu:devel
                 test:
                     - "70"
                     - "71"
                     - "72"
+                exclude:
+                    # https://github.com/dracut-ng/dracut-ng/issues/1815
+                    - container: ubuntu:devel
+                      test: "72"
         container:
             image: ghcr.io/dracut-ng/${{ matrix.container }}-amd
             options: '--device=/dev/kvm'

diff --git a/test/TEST-70-ISCSI/test.sh b/test/TEST-70-ISCSI/test.sh
index 9bc58c0d619373a3beab5acc81b017a5d812e11b..0cfdfdeee1fae8bb6e98c48d137eba9263a208b5 100755 (executable)
--- a/test/TEST-70-ISCSI/test.sh
+++ b/test/TEST-70-ISCSI/test.sh
@@ -122,10 +122,6 @@ test_check() {
         echo "Need tgtd and tgtadm from scsi-target-utils"
         return 1
     fi
-    if ! [ -f /lib/systemd/system/iscsiuio.socket ]; then
-        echo "Need iscsiuio.socket to run this test"
-        return 1
-    fi
 }
 
 test_setup() {

diff --git a/test/TEST-71-ISCSI-MULTI/test.sh b/test/TEST-71-ISCSI-MULTI/test.sh
index 818a070953b765c86bb42f3bb1a2ac4a1c0894f8..9324cae443df2484ca1c153b115ad5b44d897ea7 100755 (executable)
--- a/test/TEST-71-ISCSI-MULTI/test.sh
+++ b/test/TEST-71-ISCSI-MULTI/test.sh
@@ -129,10 +129,6 @@ test_check() {
         echo "Need tgtd and tgtadm from scsi-target-utils"
         return 1
     fi
-    if ! [ -f /lib/systemd/system/iscsiuio.socket ]; then
-        echo "Need iscsiuio.socket to run this test"
-        return 1
-    fi
 }
 
 test_setup() {