test: exclude systemd from server rootfs

After commit d36012143c7c ("test: use systemd inside client test rootfs
if available") and commit 4aaf8f24110f ("test: include systemd-journald
in client test rootfs") the test 60 on opensuse:latest fails due to not
enough memory on the server rootfs image.

So revert those two changes partially: create the server rootfs images
without systemd. Also create the client test rootfs without systemd.

diff --git a/test/TEST-60-NFS/test.sh b/test/TEST-60-NFS/test.sh
index 398bb3cc32feba284afcf828b100cf356cc27fba..81500550877482abf1f5e00c808e83f58959dfb6 100755 (executable)
--- a/test/TEST-60-NFS/test.sh
+++ b/test/TEST-60-NFS/test.sh
@@ -221,7 +221,7 @@ test_run() {
 
 test_setup() {
     call_dracut --tmpdir "$TESTDIR" \
-        --add-confdir test-root \
+        --add-confdir test-root --omit systemd \
         -a "$USE_NETWORK url-lib nfs" \
         -I "ip grep setsid" \
         -f "$TESTDIR"/initramfs.root || return 1
@@ -230,7 +230,7 @@ test_setup() {
 
     # Create what will eventually be the server root filesystem onto an overlay
     call_dracut --tmpdir "$TESTDIR"/server/overlay \
-        --add-confdir test-root \
+        --add-confdir test-root --omit systemd \
         -a "bash $USE_NETWORK nfs" \
         --add-drivers "nfsd sunrpc lockd" \
         -I "exportfs pidof rpc.nfsd rpc.mountd dhcpd" \

diff --git a/test/TEST-70-ISCSI/test.sh b/test/TEST-70-ISCSI/test.sh
index 4e926a32ad269ed6e80a34ffc0f0f4e4c2b851b9..5053223e81782b2e8df4680dcfeb6432b716b66c 100755 (executable)
--- a/test/TEST-70-ISCSI/test.sh
+++ b/test/TEST-70-ISCSI/test.sh
@@ -164,7 +164,7 @@ test_setup() {
 
     # Create what will eventually be the server root filesystem onto an overlay
     call_dracut --tmpdir "$TESTDIR" \
-        --add-confdir test-root \
+        --add-confdir test-root --omit systemd \
         -a "$USE_NETWORK" \
         -d "iscsi_tcp crc32c ipv6" \
         -I "modprobe chmod ip setsid pidof tgtd tgtadm /etc/passwd" \

diff --git a/test/TEST-71-ISCSI-MULTI/test.sh b/test/TEST-71-ISCSI-MULTI/test.sh
index d5d497df8d63907dacfa717c552c386bf57b44ce..94ba192df8e15af28d9fdcf1567ef972a822ab17 100755 (executable)
--- a/test/TEST-71-ISCSI-MULTI/test.sh
+++ b/test/TEST-71-ISCSI-MULTI/test.sh
@@ -173,7 +173,7 @@ test_setup() {
 
     rm -rf -- "$TESTDIR"/overlay
     call_dracut --tmpdir "$TESTDIR" \
-        --add-confdir test-root \
+        --add-confdir test-root --omit systemd \
         -a "$USE_NETWORK iscsi" \
         -d "iscsi_tcp crc32c ipv6 af_packet" \
         -I "ip grep sleep setsid chmod modprobe pidof tgtd tgtadm" \

diff --git a/test/TEST-72-NBD/test.sh b/test/TEST-72-NBD/test.sh
index 3d2c6824117a079c1e51401daa01d80ca7100b2b..947fd54832c9548937d2d6cb58d374b56246605c 100755 (executable)
--- a/test/TEST-72-NBD/test.sh
+++ b/test/TEST-72-NBD/test.sh
@@ -261,7 +261,7 @@ bs = 4096
 EOF
 
     call_dracut --keep --tmpdir "$TESTDIR" \
-        --add-confdir test-root \
+        --add-confdir test-root --omit systemd \
         -a "$USE_NETWORK" \
         -I "ip grep sleep nbd-server chmod modprobe pidof" \
         --install-optional "/etc/netconfig dhcpd /etc/group /etc/nsswitch.conf /etc/rpc /etc/protocols /etc/services /usr/etc/nsswitch.conf /usr/etc/rpc /usr/etc/protocols /usr/etc/services" \

diff --git a/test/modules.d/70test-root/module-setup.sh b/test/modules.d/70test-root/module-setup.sh
index bcd9a0e0fa6e80a75671a47ad8994d99f6b5d4cb..3750013b890ae0cae15f26ffa2e7a64cb0c408ad 100755 (executable)
--- a/test/modules.d/70test-root/module-setup.sh
+++ b/test/modules.d/70test-root/module-setup.sh
@@ -14,7 +14,7 @@ depends() {
     fi
 
     # Use systemd if available
-    if [[ -e "$systemdutildir"/systemd ]]; then
+    if [[ -e "$systemdutildir"/systemd ]] && ! [[ " $omit_dracutmodules " == *\ systemd\ * ]]; then
         deps+=" systemd systemd-journald"
     fi