From 8fc0dac4a434c687f8757e8fafce71fb8851f37d Mon Sep 17 00:00:00 2001 From: Laszlo Gombos Date: Fri, 25 Nov 2022 03:04:26 +0000 Subject: [PATCH] test: do not omit dracut networking modules The main motivation of this change is to prepare to enable testing all four networking dracut modules not just two. There are four networking modules supported currently. Omitting one networking module not only is not necessary but confusing as if the test really wants to omit networking modules, it should omit all three non-used dracut networking modules. --- test/TEST-20-NFS/test.sh | 4 +--- test/TEST-30-ISCSI/test.sh | 4 +--- test/TEST-35-ISCSI-MULTI/test.sh | 4 +--- test/TEST-40-NBD/test.sh | 4 +--- test/TEST-50-MULTINIC/test.sh | 4 +--- test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh | 4 +--- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh index 0467c49aa..5d3ab147b 100755 --- a/test/TEST-20-NFS/test.sh +++ b/test/TEST-20-NFS/test.sh @@ -2,10 +2,8 @@ if [[ $NM ]]; then USE_NETWORK="network-manager" - OMIT_NETWORK="network-legacy" else USE_NETWORK="network-legacy" - OMIT_NETWORK="network-manager" fi # shellcheck disable=SC2034 @@ -407,7 +405,7 @@ test_setup() { # Make client's dracut image "$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \ - -o "plymouth dash ${OMIT_NETWORK}" \ + -o "plymouth dash" \ -a "dmsquash-live debug watchdog ${USE_NETWORK}" \ --no-hostonly-cmdline -N \ -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1 diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh index 07d8016d7..99e57a323 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -2,10 +2,8 @@ if [[ $NM ]]; then USE_NETWORK="network-manager" - OMIT_NETWORK="network-legacy" else USE_NETWORK="network-legacy" - OMIT_NETWORK="network-manager" fi # shellcheck disable=SC2034 @@ -316,7 +314,7 @@ test_setup() { ) # Make client's dracut image "$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \ - -o "dash plymouth dmraid nfs ${OMIT_NETWORK}" \ + -o "dash plymouth dmraid nfs" \ -a "debug ${USE_NETWORK}" \ --no-hostonly-cmdline -N \ -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1 diff --git a/test/TEST-35-ISCSI-MULTI/test.sh b/test/TEST-35-ISCSI-MULTI/test.sh index 9c4d48387..f11b24acf 100755 --- a/test/TEST-35-ISCSI-MULTI/test.sh +++ b/test/TEST-35-ISCSI-MULTI/test.sh @@ -2,10 +2,8 @@ if [[ $NM ]]; then USE_NETWORK="network-manager" - OMIT_NETWORK="network-legacy" else USE_NETWORK="network-legacy" - OMIT_NETWORK="network-manager" fi # shellcheck disable=SC2034 @@ -328,7 +326,7 @@ test_setup() { ) # Make client's dracut image "$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \ - -o "dash plymouth dmraid nfs ${OMIT_NETWORK}" \ + -o "dash plymouth dmraid nfs" \ -a "debug ${USE_NETWORK}" \ --no-hostonly-cmdline -N \ -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1 diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh index f5654e7f0..54ba5982c 100755 --- a/test/TEST-40-NBD/test.sh +++ b/test/TEST-40-NBD/test.sh @@ -2,10 +2,8 @@ if [[ $NM ]]; then USE_NETWORK="network-manager" - OMIT_NETWORK="network-legacy" else USE_NETWORK="network-legacy" - OMIT_NETWORK="network-manager" fi # shellcheck disable=SC2034 @@ -486,7 +484,7 @@ test_setup() { ) "$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \ - -o "plymouth dash iscsi nfs ${OMIT_NETWORK}" \ + -o "plymouth dash iscsi nfs" \ -a "debug watchdog ${USE_NETWORK}" \ --no-hostonly-cmdline -N \ -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1 diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh index 6f01e0818..5a47b096c 100755 --- a/test/TEST-50-MULTINIC/test.sh +++ b/test/TEST-50-MULTINIC/test.sh @@ -2,10 +2,8 @@ if [[ $NM ]]; then USE_NETWORK="network-manager" - OMIT_NETWORK="network-legacy" else USE_NETWORK="network-legacy" - OMIT_NETWORK="network-manager" fi # shellcheck disable=SC2034 @@ -354,7 +352,7 @@ test_setup() { ) # Make client's dracut image "$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \ - -o "ifcfg plymouth dash ${OMIT_NETWORK}" \ + -o "ifcfg plymouth dash" \ -a "debug watchdog ${USE_NETWORK}" \ --no-hostonly-cmdline -N \ -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1 diff --git a/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh b/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh index 408fcf60f..dc8dd62db 100755 --- a/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh +++ b/test/TEST-60-BONDBRIDGEVLANIFCFG/test.sh @@ -4,10 +4,8 @@ if [[ $NM ]]; then USE_NETWORK="network-manager" - OMIT_NETWORK="network-legacy" else USE_NETWORK="network-legacy" - OMIT_NETWORK="network-manager" fi # shellcheck disable=SC2034 @@ -369,7 +367,7 @@ test_setup() { # Make client's dracut image "$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \ --no-early-microcode \ - -o "plymouth ${OMIT_NETWORK}" \ + -o "plymouth" \ -a "debug ${USE_NETWORK}" \ --no-hostonly-cmdline -N \ -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1 -- 2.47.2