ci: add support for non-legacy network dracut modules

Those network tests that need a server VM currently only
support network-legacy.

Upgrade those test cases to support other network dracut modules
such as network-manager.

diff --git a/test/TEST-60-NFS/test.sh b/test/TEST-60-NFS/test.sh
index e621b673e87b86673de92acfca5bb24fd14669a9..1432b7d58cce92df16f2ed722f5f90bb729701f0 100755 (executable)
--- a/test/TEST-60-NFS/test.sh
+++ b/test/TEST-60-NFS/test.sh
@@ -242,7 +242,7 @@ test_setup() {
     # Create what will eventually be the server root filesystem onto an overlay
     "$DRACUT" -N --keep --tmpdir "$TESTDIR"/server/overlay \
         --add-confdir test-root \
-        -a "bash network-legacy nfs" \
+        -a "bash $USE_NETWORK nfs" \
         --add-drivers "nfsd sunrpc lockd" \
         -I "exportfs rpc.nfsd rpc.mountd dhcpd" \
         --install-optional "/etc/netconfig /etc/nsswitch.conf /etc/rpc /etc/protocols /etc/services /usr/etc/nsswitch.conf /usr/etc/rpc /usr/etc/protocols /usr/etc/services rpc.idmapd /etc/idmapd.conf" \
@@ -300,7 +300,7 @@ test_setup() {
 
     # Make server's dracut image
     "$DRACUT" -i "$TESTDIR"/overlay / \
-        -a "bash network-legacy ${SERVER_DEBUG:+debug}" \
+        -a "bash $USE_NETWORK ${SERVER_DEBUG:+debug}" \
         --include ./server.link /etc/systemd/network/01-server.link \
         --include ./wait-if-server.sh /lib/dracut/hooks/pre-mount/99-wait-if-server.sh \
         --add-drivers "ext4" \

diff --git a/test/TEST-70-ISCSI/test.sh b/test/TEST-70-ISCSI/test.sh
index 13d0227d4eb87b7c563f607a900a9a34f20f7ea5..e203dd009831f0adae6d4548cc2775847d8dcd2c 100755 (executable)
--- a/test/TEST-70-ISCSI/test.sh
+++ b/test/TEST-70-ISCSI/test.sh
@@ -173,7 +173,7 @@ test_setup() {
     # Create what will eventually be the server root filesystem onto an overlay
     "$DRACUT" -N --keep --tmpdir "$TESTDIR" \
         --add-confdir test-root \
-        -a network-legacy \
+        -a "$USE_NETWORK" \
         -d "iscsi_tcp crc32c ipv6" \
         -I "modprobe chmod ip setsid pidof tgtd tgtadm /etc/passwd" \
         --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" \
@@ -209,7 +209,7 @@ test_setup() {
 
     # Make server's dracut image
     "$DRACUT" \
-        -a "network-legacy" \
+        -a "$USE_NETWORK" \
         --add-confdir test \
         -d "piix ide-gd_mod ata_piix ext4 sd_mod drbg virtio_net virtio_pci virtio_scsi" \
         -i "./server.link" "/etc/systemd/network/01-server.link" \

diff --git a/test/TEST-71-ISCSI-MULTI/test.sh b/test/TEST-71-ISCSI-MULTI/test.sh
index bf7e35fee5ccbcc687a367292bc7281fc390f2d2..740439bd8ac9a05d387f8a74b781eaf3c384046d 100755 (executable)
--- a/test/TEST-71-ISCSI-MULTI/test.sh
+++ b/test/TEST-71-ISCSI-MULTI/test.sh
@@ -182,7 +182,7 @@ test_setup() {
     rm -rf -- "$TESTDIR"/overlay
     "$DRACUT" -N --keep --tmpdir "$TESTDIR" \
         --add-confdir test-root \
-        -a "network-legacy iscsi" \
+        -a "$USE_NETWORK iscsi" \
         -d "iscsi_tcp crc32c ipv6 af_packet" \
         -I "ip grep sleep setsid chmod modprobe pidof tgtd tgtadm" \
         --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" \
@@ -227,7 +227,7 @@ test_setup() {
     # Make server's dracut image
     "$DRACUT" -i "$TESTDIR"/overlay / \
         --add-confdir test \
-        -a "rootfs-block kernel-modules network-legacy ${SERVER_DEBUG:+debug}" \
+        -a "rootfs-block kernel-modules $USE_NETWORK ${SERVER_DEBUG:+debug}" \
         -d "af_packet piix ide-gd_mod ata_piix ext4 sd_mod drbg virtio_net" \
         -i "./server.link" "/etc/systemd/network/01-server.link" \
         -i "./wait-if-server.sh" "/lib/dracut/hooks/pre-mount/99-wait-if-server.sh" \

diff --git a/test/TEST-72-NBD/test.sh b/test/TEST-72-NBD/test.sh
index 68bafb71913240dac3f2477671811101debfd0b7..7fc655e93f97c28948674a8b3f2a0ce7fed3b533 100755 (executable)
--- a/test/TEST-72-NBD/test.sh
+++ b/test/TEST-72-NBD/test.sh
@@ -267,7 +267,7 @@ EOF
 
     "$DRACUT" --keep --tmpdir "$TESTDIR" \
         --add-confdir test-root \
-        -a "network-legacy" \
+        -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" \
         -i /tmp/config /etc/nbd-server/config \
@@ -284,7 +284,7 @@ EOF
     # devices, volume groups, encrypted partitions, etc.
     "$DRACUT" -N -i "$TESTDIR"/overlay / \
         --add-confdir test-makeroot \
-        -a "network-legacy" \
+        -a "$USE_NETWORK" \
         -i ./create-server-root.sh /lib/dracut/hooks/initqueue/01-create-server-root.sh \
         --nomdadmconf \
         --no-hostonly-cmdline -N \
@@ -328,7 +328,7 @@ test_setup() {
 
     "$DRACUT" -N -i "$TESTDIR"/overlay / \
         --add-confdir test \
-        -a "network-legacy ${SERVER_DEBUG:+debug}" \
+        -a "$USE_NETWORK ${SERVER_DEBUG:+debug}" \
         -d "af_packet piix ide-gd_mod ata_piix ext4 sd_mod drbg virtio_net" \
         -i "./server.link" "/etc/systemd/network/01-server.link" \
         -i "./wait-if-server.sh" "/lib/dracut/hooks/pre-mount/99-wait-if-server.sh" \