From 6d1a8989a0c7306fa4b7d4d983f5ba3c770350a9 Mon Sep 17 00:00:00 2001 From: Jo Zzsi Date: Sat, 13 Sep 2025 19:22:53 -0400 Subject: [PATCH] ci: simplify test cases Remove unnecessary opinionated parts of the test cases. Do not add and manage drivers manually in the test case unless the test case is specifically testing for that. Consolidate test configurations into common comfig files when possible. --- dracut.conf.d/test-makeroot/test-makeroot.conf | 6 +++++- dracut.conf.d/test-root/test-root.conf | 6 +++++- test/TEST-10-BASIC/test.sh | 2 +- test/TEST-11-USR-MOUNT/test.sh | 4 ++-- test/TEST-12-UEFI/test.sh | 2 +- test/TEST-13-SYSROOT/test.sh | 2 +- test/TEST-20-STORAGE/test.sh | 4 ++-- test/TEST-26-ENC-RAID-LVM/test.sh | 4 ++-- test/TEST-30-DMSQUASH/test.sh | 2 +- test/TEST-40-SYSTEMD/test.sh | 6 ++---- test/TEST-41-FULL-SYSTEMD/test.sh | 4 ++-- test/TEST-42-SYSTEMD-INITRD/test.sh | 6 ++---- test/TEST-43-KERNEL-INSTALL/test.sh | 2 +- test/TEST-50-NETWORK/test.sh | 2 +- test/TEST-60-NFS/test.sh | 11 +++-------- test/TEST-70-ISCSI/test.sh | 8 +++----- test/TEST-71-ISCSI-MULTI/test.sh | 8 +++----- test/TEST-72-NBD/test.sh | 12 +++--------- 18 files changed, 40 insertions(+), 51 deletions(-) diff --git a/dracut.conf.d/test-makeroot/test-makeroot.conf b/dracut.conf.d/test-makeroot/test-makeroot.conf index d6a0067fc..ce789edc9 100644 --- a/dracut.conf.d/test-makeroot/test-makeroot.conf +++ b/dracut.conf.d/test-makeroot/test-makeroot.conf @@ -4,5 +4,9 @@ compress="cat" do_strip="no" do_hardlink="no" early_microcode="no" -hostonly_cmdline="no" +hostonly="no" stdloglvl=2 +mdadmconf="no" + +# testsuite assumes the following drivers for convenience +add_drivers+=" ext4 sd_mod " diff --git a/dracut.conf.d/test-root/test-root.conf b/dracut.conf.d/test-root/test-root.conf index 2bb46dc90..a3ab558c9 100644 --- a/dracut.conf.d/test-root/test-root.conf +++ b/dracut.conf.d/test-root/test-root.conf @@ -4,5 +4,9 @@ compress="cat" do_strip="no" do_hardlink="no" early_microcode="no" -hostonly_cmdline="no" +hostonly="no" stdloglvl=2 +keep=yes + +# testsuite assumes the following drivers for convenience +add_drivers+=" ext4 sd_mod " diff --git a/test/TEST-10-BASIC/test.sh b/test/TEST-10-BASIC/test.sh index 765db7ca5..adc5398eb 100755 --- a/test/TEST-10-BASIC/test.sh +++ b/test/TEST-10-BASIC/test.sh @@ -22,7 +22,7 @@ test_run() { test_setup() { # create root filesystem - "$DRACUT" -N --keep --tmpdir "$TESTDIR" \ + "$DRACUT" --tmpdir "$TESTDIR" \ --add-confdir test-root \ -f "$TESTDIR"/initramfs.root diff --git a/test/TEST-11-USR-MOUNT/test.sh b/test/TEST-11-USR-MOUNT/test.sh index 4b5c51697..34c691427 100755 --- a/test/TEST-11-USR-MOUNT/test.sh +++ b/test/TEST-11-USR-MOUNT/test.sh @@ -48,7 +48,7 @@ test_run() { test_setup() { # Create what will eventually be our root filesystem onto an overlay - "$DRACUT" -N --keep --tmpdir "$TESTDIR" \ + "$DRACUT" --tmpdir "$TESTDIR" \ --add-confdir test-root \ --mount "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_root /usr btrfs subvol=usr,rw" \ -f "$TESTDIR"/initramfs.root @@ -57,7 +57,7 @@ test_setup() { # create an initramfs that will create the target root filesystem. # We do it this way so that we do not risk trashing the host mdraid # devices, volume groups, encrypted partitions, etc. - "$DRACUT" -N -i "$TESTDIR"/overlay / \ + "$DRACUT" -i "$TESTDIR"/overlay / \ --add-confdir test-makeroot \ -I "mkfs.btrfs" \ -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \ diff --git a/test/TEST-12-UEFI/test.sh b/test/TEST-12-UEFI/test.sh index aaba9b998..2ff1e16d9 100755 --- a/test/TEST-12-UEFI/test.sh +++ b/test/TEST-12-UEFI/test.sh @@ -44,7 +44,7 @@ test_run() { test_setup() { # Create what will eventually be our root filesystem - "$DRACUT" -N --keep --tmpdir "$TESTDIR" \ + "$DRACUT" --tmpdir "$TESTDIR" \ --add-confdir test-root \ "$TESTDIR"/tmp-initramfs.root diff --git a/test/TEST-13-SYSROOT/test.sh b/test/TEST-13-SYSROOT/test.sh index 479dca64d..5996edd92 100755 --- a/test/TEST-13-SYSROOT/test.sh +++ b/test/TEST-13-SYSROOT/test.sh @@ -22,7 +22,7 @@ test_run() { test_setup() { # create root filesystem - "$DRACUT" -N --keep --tmpdir "$TESTDIR" \ + "$DRACUT" --tmpdir "$TESTDIR" \ --add-confdir test-root \ -f "$TESTDIR"/initramfs.root diff --git a/test/TEST-20-STORAGE/test.sh b/test/TEST-20-STORAGE/test.sh index c1d9b212f..78857f91a 100755 --- a/test/TEST-20-STORAGE/test.sh +++ b/test/TEST-20-STORAGE/test.sh @@ -114,7 +114,7 @@ test_makeroot() { test_setup() { # Create what will eventually be our root filesystem onto an overlay - "$DRACUT" -N --keep --tmpdir "$TESTDIR" \ + "$DRACUT" --tmpdir "$TESTDIR" \ --add-confdir test-root \ -f "$TESTDIR"/initramfs.root mkdir -p "$TESTDIR"/overlay/source && mv "$TESTDIR"/dracut.*/initramfs/* "$TESTDIR"/overlay/source && rm -rf "$TESTDIR"/dracut.* @@ -127,7 +127,7 @@ test_setup() { # devices, volume groups, encrypted partitions, etc. # shellcheck disable=SC2046 - "$DRACUT" -N -i "$TESTDIR"/overlay / \ + "$DRACUT" -i "$TESTDIR"/overlay / \ --add-confdir test-makeroot \ -a "lvm" \ -I "grep" \ diff --git a/test/TEST-26-ENC-RAID-LVM/test.sh b/test/TEST-26-ENC-RAID-LVM/test.sh index e88c92737..217d4cf91 100755 --- a/test/TEST-26-ENC-RAID-LVM/test.sh +++ b/test/TEST-26-ENC-RAID-LVM/test.sh @@ -54,7 +54,7 @@ test_run() { test_setup() { # Create what will eventually be our root filesystem onto an overlay - "$DRACUT" -N --keep --tmpdir "$TESTDIR" \ + "$DRACUT" --tmpdir "$TESTDIR" \ --add-confdir test-root \ -f "$TESTDIR"/initramfs.root mkdir -p "$TESTDIR"/overlay/source && mv "$TESTDIR"/dracut.*/initramfs/* "$TESTDIR"/overlay/source && rm -rf "$TESTDIR"/dracut.* @@ -62,7 +62,7 @@ test_setup() { # create an initramfs that will create the target root filesystem. # We do it this way so that we do not risk trashing the host mdraid # devices, volume groups, encrypted partitions, etc. - "$DRACUT" -N -i "$TESTDIR"/overlay / \ + "$DRACUT" -i "$TESTDIR"/overlay / \ --add-confdir test-makeroot \ -a "bash crypt lvm mdraid" \ -I "grep cryptsetup" \ diff --git a/test/TEST-30-DMSQUASH/test.sh b/test/TEST-30-DMSQUASH/test.sh index 52d786def..92a27600d 100755 --- a/test/TEST-30-DMSQUASH/test.sh +++ b/test/TEST-30-DMSQUASH/test.sh @@ -80,7 +80,7 @@ test_run() { test_setup() { # Create what will eventually be our root filesystem onto an overlay - "$DRACUT" -N --keep --tmpdir "$TESTDIR" \ + "$DRACUT" --tmpdir "$TESTDIR" \ --add-confdir test-root \ -i ./test-init.sh /sbin/init-persist \ -f "$TESTDIR"/initramfs.root diff --git a/test/TEST-40-SYSTEMD/test.sh b/test/TEST-40-SYSTEMD/test.sh index 6d1f10cef..7e4df7517 100755 --- a/test/TEST-40-SYSTEMD/test.sh +++ b/test/TEST-40-SYSTEMD/test.sh @@ -26,7 +26,7 @@ test_run() { test_setup() { # Create what will eventually be our root filesystem onto an overlay - "$DRACUT" -N --keep --tmpdir "$TESTDIR" \ + "$DRACUT" --tmpdir "$TESTDIR" \ --add-confdir test-root \ -f "$TESTDIR"/initramfs.root mkdir -p "$TESTDIR"/overlay/source && mv "$TESTDIR"/dracut.*/initramfs/* "$TESTDIR"/overlay/source && rm -rf "$TESTDIR"/dracut.* @@ -34,11 +34,9 @@ test_setup() { # create an initramfs that will create the target root filesystem. # We do it this way so that we do not risk trashing the host mdraid # devices, volume groups, encrypted partitions, etc. - "$DRACUT" -N -i "$TESTDIR"/overlay / \ + "$DRACUT" -i "$TESTDIR"/overlay / \ --add-confdir "test-makeroot" \ -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \ - --nomdadmconf \ - -N \ -f "$TESTDIR"/initramfs.makeroot declare -a disk_args=() diff --git a/test/TEST-41-FULL-SYSTEMD/test.sh b/test/TEST-41-FULL-SYSTEMD/test.sh index e746b75bc..73a71cf6b 100755 --- a/test/TEST-41-FULL-SYSTEMD/test.sh +++ b/test/TEST-41-FULL-SYSTEMD/test.sh @@ -98,7 +98,7 @@ test_setup() { fi # Create what will eventually be our root filesystem onto an overlay - "$DRACUT" -N --keep --tmpdir "$TESTDIR" \ + "$DRACUT" --tmpdir "$TESTDIR" \ --add-confdir test-root \ -a "$dracut_modules" \ -f "$TESTDIR"/initramfs.root @@ -110,7 +110,7 @@ test_setup() { # create an initramfs that will create the target root filesystem. # We do it this way so that we do not risk trashing the host mdraid # devices, volume groups, encrypted partitions, etc. - "$DRACUT" -N -i "$TESTDIR"/overlay / \ + "$DRACUT" -i "$TESTDIR"/overlay / \ --add-confdir test-makeroot \ -a "btrfs crypt" \ -I "mkfs.btrfs cryptsetup" \ diff --git a/test/TEST-42-SYSTEMD-INITRD/test.sh b/test/TEST-42-SYSTEMD-INITRD/test.sh index 4d3b07e73..fc741c74f 100755 --- a/test/TEST-42-SYSTEMD-INITRD/test.sh +++ b/test/TEST-42-SYSTEMD-INITRD/test.sh @@ -42,7 +42,7 @@ test_run() { test_setup() { # Create what will eventually be our root filesystem onto an overlay - "$DRACUT" -N --keep --tmpdir "$TESTDIR" \ + "$DRACUT" --tmpdir "$TESTDIR" \ --add-confdir test-root \ -f "$TESTDIR"/initramfs.root mkdir -p "$TESTDIR"/overlay/source && mv "$TESTDIR"/dracut.*/initramfs/* "$TESTDIR"/overlay/source && rm -rf "$TESTDIR"/dracut.* @@ -50,11 +50,9 @@ test_setup() { # create an initramfs that will create the target root filesystem. # We do it this way so that we do not risk trashing the host mdraid # devices, volume groups, encrypted partitions, etc. - "$DRACUT" -N -i "$TESTDIR"/overlay / \ + "$DRACUT" -i "$TESTDIR"/overlay / \ --add-confdir test-makeroot \ -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \ - --nomdadmconf \ - -N \ -f "$TESTDIR"/initramfs.makeroot declare -a disk_args=() diff --git a/test/TEST-43-KERNEL-INSTALL/test.sh b/test/TEST-43-KERNEL-INSTALL/test.sh index edd4f68ff..d170f224a 100755 --- a/test/TEST-43-KERNEL-INSTALL/test.sh +++ b/test/TEST-43-KERNEL-INSTALL/test.sh @@ -50,7 +50,7 @@ test_run() { test_setup() { # create root filesystem # shellcheck disable=SC2153 - "$DRACUT" -N --keep --tmpdir "$TESTDIR" \ + "$DRACUT" --tmpdir "$TESTDIR" \ --add-confdir test-root \ -f "$TESTDIR"/initramfs.root diff --git a/test/TEST-50-NETWORK/test.sh b/test/TEST-50-NETWORK/test.sh index 7f0e1f928..d2e1e461f 100755 --- a/test/TEST-50-NETWORK/test.sh +++ b/test/TEST-50-NETWORK/test.sh @@ -26,7 +26,7 @@ test_run() { test_setup() { # create root filesystem - "$DRACUT" -N --keep --tmpdir "$TESTDIR" \ + "$DRACUT" --tmpdir "$TESTDIR" \ -I "ip" \ -i "./assertion.sh" "/assertion.sh" \ --add-confdir test-root \ diff --git a/test/TEST-60-NFS/test.sh b/test/TEST-60-NFS/test.sh index 67a694b02..b1c0c3387 100755 --- a/test/TEST-60-NFS/test.sh +++ b/test/TEST-60-NFS/test.sh @@ -226,7 +226,7 @@ test_run() { } test_setup() { - "$DRACUT" -N --keep --tmpdir "$TESTDIR" \ + "$DRACUT" --tmpdir "$TESTDIR" \ --add-confdir test-root \ -a "url-lib nfs" \ -I "ip grep setsid" \ @@ -235,7 +235,7 @@ test_setup() { mkdir -p "$TESTDIR"/server/overlay # Create what will eventually be the server root filesystem onto an overlay - "$DRACUT" -N --keep --tmpdir "$TESTDIR"/server/overlay \ + "$DRACUT" --tmpdir "$TESTDIR"/server/overlay \ --add-confdir test-root \ -a "bash $USE_NETWORK nfs" \ --add-drivers "nfsd sunrpc lockd" \ @@ -265,12 +265,8 @@ test_setup() { # devices, volume groups, encrypted partitions, etc. "$DRACUT" -i "$TESTDIR"/server/overlay / \ --add-confdir test-makeroot \ - -a "bash rootfs-block kernel-modules qemu" \ - --add-drivers "ext4" \ - -I "mkfs.ext4" \ + -a "bash" \ -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \ - --nomdadmconf \ - -N \ -f "$TESTDIR"/initramfs.makeroot rm -rf -- "$TESTDIR"/server @@ -298,7 +294,6 @@ test_setup() { -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" \ -N \ -f "$TESTDIR"/initramfs.server } diff --git a/test/TEST-70-ISCSI/test.sh b/test/TEST-70-ISCSI/test.sh index 78270761f..e35f5360f 100755 --- a/test/TEST-70-ISCSI/test.sh +++ b/test/TEST-70-ISCSI/test.sh @@ -130,7 +130,7 @@ test_check() { test_setup() { # Create what will eventually be the client root filesystem onto an overlay - "$DRACUT" -N --keep --tmpdir "$TESTDIR" \ + "$DRACUT" --tmpdir "$TESTDIR" \ --add-confdir test-root \ -I "ip grep setsid" \ -f "$TESTDIR"/initramfs.root @@ -147,7 +147,6 @@ test_setup() { -a "crypt lvm mdraid" \ -I "setsid blockdev" \ -i ./create-client-root.sh /lib/dracut/hooks/initqueue/01-create-client-root.sh \ - -N \ -f "$TESTDIR"/initramfs.makeroot rm -rf -- "$TESTDIR"/overlay @@ -167,7 +166,7 @@ test_setup() { rm -- "$TESTDIR"/marker.img # Create what will eventually be the server root filesystem onto an overlay - "$DRACUT" -N --keep --tmpdir "$TESTDIR" \ + "$DRACUT" --tmpdir "$TESTDIR" \ --add-confdir test-root \ -a "$USE_NETWORK" \ -d "iscsi_tcp crc32c ipv6" \ @@ -183,7 +182,7 @@ test_setup() { # create an initramfs that will create the target root filesystem. # We do it this way so that we do not risk trashing the host mdraid # devices, volume groups, encrypted partitions, etc. - "$DRACUT" -N -i "$TESTDIR"/overlay / \ + "$DRACUT" -i "$TESTDIR"/overlay / \ --add-confdir test-makeroot \ -i ./create-server-root.sh /lib/dracut/hooks/initqueue/01-create-server-root.sh \ -f "$TESTDIR"/initramfs.makeroot @@ -207,7 +206,6 @@ test_setup() { "$DRACUT" \ -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" \ -i ./wait-if-server.sh /lib/dracut/hooks/pre-mount/99-wait-if-server.sh \ -N \ diff --git a/test/TEST-71-ISCSI-MULTI/test.sh b/test/TEST-71-ISCSI-MULTI/test.sh index aff9ce2bd..70aebe3c8 100755 --- a/test/TEST-71-ISCSI-MULTI/test.sh +++ b/test/TEST-71-ISCSI-MULTI/test.sh @@ -155,7 +155,6 @@ test_setup() { -a "crypt lvm mdraid" \ -I "setsid blockdev" \ -i ./create-client-root.sh /lib/dracut/hooks/initqueue/01-create-client-root.sh \ - -N \ -f "$TESTDIR"/initramfs.makeroot rm -rf -- "$TESTDIR"/overlay @@ -175,7 +174,7 @@ test_setup() { rm -- "$TESTDIR"/marker.img rm -rf -- "$TESTDIR"/overlay - "$DRACUT" -N --keep --tmpdir "$TESTDIR" \ + "$DRACUT" --tmpdir "$TESTDIR" \ --add-confdir test-root \ -a "$USE_NETWORK iscsi" \ -d "iscsi_tcp crc32c ipv6 af_packet" \ @@ -192,7 +191,7 @@ test_setup() { # create an initramfs that will create the target root filesystem. # We do it this way so that we do not risk trashing the host mdraid # devices, volume groups, encrypted partitions, etc. - "$DRACUT" -N -i "$TESTDIR"/overlay / \ + "$DRACUT" -i "$TESTDIR"/overlay / \ --add-confdir test-makeroot \ -i ./create-server-root.sh /lib/dracut/hooks/initqueue/01-create-server-root.sh \ -f "$TESTDIR"/initramfs.makeroot @@ -222,8 +221,7 @@ test_setup() { # Make server's dracut image "$DRACUT" -i "$TESTDIR"/overlay / \ --add-confdir test \ - -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" \ + -a "$USE_NETWORK ${SERVER_DEBUG:+debug}" \ -i "./server.link" "/etc/systemd/network/01-server.link" \ -i "./wait-if-server.sh" "/lib/dracut/hooks/pre-mount/99-wait-if-server.sh" \ -N \ diff --git a/test/TEST-72-NBD/test.sh b/test/TEST-72-NBD/test.sh index 98bacb955..f54cfaf40 100755 --- a/test/TEST-72-NBD/test.sh +++ b/test/TEST-72-NBD/test.sh @@ -177,7 +177,7 @@ client_run() { make_encrypted_root() { rm -fr "$TESTDIR"/overlay # Create what will eventually be our root filesystem onto an overlay - "$DRACUT" --keep --tmpdir "$TESTDIR" \ + "$DRACUT" --tmpdir "$TESTDIR" \ --add-confdir test-root \ -I "ip grep" \ --no-hostonly \ @@ -193,7 +193,6 @@ make_encrypted_root() { -a "crypt lvm mdraid" \ -I "cryptsetup" \ -i ./create-encrypted-root.sh /lib/dracut/hooks/initqueue/01-create-encrypted-root.sh \ - -N \ -f "$TESTDIR"/initramfs.makeroot rm -rf -- "$TESTDIR"/overlay @@ -213,7 +212,7 @@ make_encrypted_root() { make_client_root() { rm -fr "$TESTDIR"/overlay - "$DRACUT" --keep --tmpdir "$TESTDIR" \ + "$DRACUT" --tmpdir "$TESTDIR" \ --add-confdir test-root \ -I "ip" \ --no-hostonly \ @@ -227,8 +226,6 @@ make_client_root() { "$DRACUT" -i "$TESTDIR"/overlay / \ --add-confdir test-makeroot \ -i ./create-client-root.sh /lib/dracut/hooks/initqueue/01-create-client-root.sh \ - --nomdadmconf \ - -N \ -f "$TESTDIR"/initramfs.makeroot declare -a disk_args=() @@ -277,12 +274,10 @@ EOF # create an initramfs that will create the target root filesystem. # We do it this way so that we do not risk trashing the host mdraid # devices, volume groups, encrypted partitions, etc. - "$DRACUT" -N -i "$TESTDIR"/overlay / \ + "$DRACUT" -i "$TESTDIR"/overlay / \ --add-confdir test-makeroot \ -a "$USE_NETWORK" \ -i ./create-server-root.sh /lib/dracut/hooks/initqueue/01-create-server-root.sh \ - --nomdadmconf \ - -N \ -f "$TESTDIR"/initramfs.makeroot declare -a disk_args=() @@ -324,7 +319,6 @@ test_setup() { "$DRACUT" -N -i "$TESTDIR"/overlay / \ --add-confdir test \ -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" \ -f "$TESTDIR"/initramfs.server -- 2.47.3