ci: consolidate output filename for test runs

Move initramfs.testing output file name from individual
testins into test-functions.

diff --git a/test/TEST-10-BASIC/test.sh b/test/TEST-10-BASIC/test.sh
index c0802d59403047d9136858edec10eae8ff8954c8..c064d7e849c856463116ff4692bd874309ddae14 100755 (executable)
--- a/test/TEST-10-BASIC/test.sh
+++ b/test/TEST-10-BASIC/test.sh
@@ -27,8 +27,7 @@ test_setup() {
     dd if=/dev/zero of="$TESTDIR"/root.img bs=200MiB count=1 status=none && sync
     mkfs.ext4 -q -L dracut -d "$TESTDIR"/dracut.*/initramfs/ "$TESTDIR"/root.img && sync
 
-    test_dracut \
-        "$TESTDIR"/initramfs.testing
+    test_dracut
 }
 
 # shellcheck disable=SC1090

diff --git a/test/TEST-11-USR-MOUNT/test.sh b/test/TEST-11-USR-MOUNT/test.sh
index 51462147ddffb9c1bcc1e410bb41f74d9255b4cf..5e31fc2799cb24c64743d043a77e5e00e84458fc 100755 (executable)
--- a/test/TEST-11-USR-MOUNT/test.sh
+++ b/test/TEST-11-USR-MOUNT/test.sh
@@ -82,8 +82,7 @@ test_setup() {
     fi
 
     test_dracut \
-        -d "btrfs" \
-        "$TESTDIR"/initramfs.testing
+        -d "btrfs"
 }
 
 # shellcheck disable=SC1090

diff --git a/test/TEST-12-UEFI/test.sh b/test/TEST-12-UEFI/test.sh
index 2b6edf53d409fd94a70bc96581311fc231042210..89700ea4b0d22dbce6b43a81f6c0a95fd94e7ae9 100755 (executable)
--- a/test/TEST-12-UEFI/test.sh
+++ b/test/TEST-12-UEFI/test.sh
@@ -58,8 +58,7 @@ test_setup() {
     if command -v ukify &> /dev/null; then
         echo "Using ukify to create UKI"
         test_dracut --no-uefi \
-            --drivers 'squashfs' \
-            "$TESTDIR"/initramfs.testing
+            --drivers 'squashfs'
 
         ukify build \
             --linux="$VMLINUZ" \

diff --git a/test/TEST-20-STORAGE/test.sh b/test/TEST-20-STORAGE/test.sh
index b8c31cc3863498713b7f186e264c45b39e48dd71..57669d4039827386f6a27ef6bd35b806b9ee8ae1 100755 (executable)
--- a/test/TEST-20-STORAGE/test.sh
+++ b/test/TEST-20-STORAGE/test.sh
@@ -167,8 +167,7 @@ test_setup() {
         $(if command -v cryptsetup > /dev/null; then echo "-a crypt"; fi) \
         $(if [ "$TEST_FSTYPE" = "zfs" ]; then echo "-a zfs"; else echo "--add-drivers ${TEST_FSTYPE}"; fi) \
         -i "/tmp/crypttab" "/etc/crypttab" \
-        -i "/tmp/key" "/etc/key" \
-        "$TESTDIR"/initramfs.testing
+        -i "/tmp/key" "/etc/key"
 }
 
 # shellcheck disable=SC1090

diff --git a/test/TEST-23-IMSM/test.sh b/test/TEST-23-IMSM/test.sh
index 475267fcc55efd92fd222c5d38eddeb1ec9746ae..fe41aa5c2bfd6bd61f3a8266a219769d605a2df3 100755 (executable)
--- a/test/TEST-23-IMSM/test.sh
+++ b/test/TEST-23-IMSM/test.sh
@@ -94,8 +94,7 @@ test_setup() {
     echo "$MD_UUID" > "$TESTDIR"/mduuid
 
     test_dracut \
-        -a "lvm mdraid" \
-        "$TESTDIR"/initramfs.testing
+        -a "lvm mdraid"
 }
 
 # shellcheck disable=SC1090

diff --git a/test/TEST-26-ENC-RAID-LVM/test.sh b/test/TEST-26-ENC-RAID-LVM/test.sh
index 31139dcd0a266b84f740cb80270c10e8a9377266..d66282a9d6e1c4aca293ff4f68d64b55d92844f7 100755 (executable)
--- a/test/TEST-26-ENC-RAID-LVM/test.sh
+++ b/test/TEST-26-ENC-RAID-LVM/test.sh
@@ -100,8 +100,7 @@ test_setup() {
     test_dracut \
         -a "crypt lvm mdraid" \
         -i "/tmp/crypttab" "/etc/crypttab" \
-        -i "/tmp/key" "/etc/key" \
-        "$TESTDIR"/initramfs.testing
+        -i "/tmp/key" "/etc/key"
 }
 
 # shellcheck disable=SC1090

diff --git a/test/TEST-30-DMSQUASH/test.sh b/test/TEST-30-DMSQUASH/test.sh
index 7655977ab40e14a7c50f7e9dc6c510c16002a898..fe35d67fb6e4c5be3f6056fb2fc222ff108da0ec 100755 (executable)
--- a/test/TEST-30-DMSQUASH/test.sh
+++ b/test/TEST-30-DMSQUASH/test.sh
@@ -128,8 +128,7 @@ EOF
 
     test_dracut \
         --no-hostonly \
-        --modules "dmsquash-live-autooverlay" \
-        "$TESTDIR"/initramfs.testing
+        --modules "dmsquash-live-autooverlay"
 }
 
 # shellcheck disable=SC1090

diff --git a/test/TEST-40-SYSTEMD/test.sh b/test/TEST-40-SYSTEMD/test.sh
index 2f667aedfb8d520bab98228ad37bc7d92dbf09d6..8e908a1176a9f9b01cd78175ab6cb5c1ef709f94 100755 (executable)
--- a/test/TEST-40-SYSTEMD/test.sh
+++ b/test/TEST-40-SYSTEMD/test.sh
@@ -62,8 +62,7 @@ test_setup() {
     test_dracut \
         --omit-drivers 'a b c d e f g h i j k l m n o p q r s t u v w x y z' \
         -i ./systemd-analyze.sh /lib/dracut/hooks/pre-pivot/00-systemd-analyze.sh \
-        -i "/bin/true" "/usr/bin/man" \
-        "$TESTDIR"/initramfs.testing
+        -i "/bin/true" "/usr/bin/man"
 }
 
 # shellcheck disable=SC1090

diff --git a/test/TEST-41-FULL-SYSTEMD/test.sh b/test/TEST-41-FULL-SYSTEMD/test.sh
index cec2df7fac1751e83333b3866c7430c46e907abf..aaf8cd74a594abdc3db34226f1223dde28cff479 100755 (executable)
--- a/test/TEST-41-FULL-SYSTEMD/test.sh
+++ b/test/TEST-41-FULL-SYSTEMD/test.sh
@@ -126,8 +126,7 @@ test_setup() {
     # force add all available dracut modules that are dependent on systemd
     test_dracut \
         -a "dracut-systemd $dracut_modules" \
-        --add-drivers "btrfs" \
-        "$TESTDIR"/initramfs.testing
+        --add-drivers "btrfs"
 
     if command -v mkosi-initrd &> /dev/null; then
         mkosi-initrd --kernel-version "$KVERSION" -t directory -o mkosi -O "$TESTDIR"

diff --git a/test/TEST-60-NFS/test.sh b/test/TEST-60-NFS/test.sh
index 987abeba8b9760f1d5aa905b3051a0d4fb20d74b..e16194878c9c112c55a1bf59fdfe42c7260da513 100755 (executable)
--- a/test/TEST-60-NFS/test.sh
+++ b/test/TEST-60-NFS/test.sh
@@ -395,8 +395,7 @@ test_setup() {
     # Make client's dracut image
     test_dracut \
         --no-hostonly --no-hostonly-cmdline \
-        -a "dmsquash-live ${USE_NETWORK}" \
-        "$TESTDIR"/initramfs.testing
+        -a "dmsquash-live ${USE_NETWORK}"
 
     (
         # shellcheck disable=SC2031

diff --git a/test/TEST-61-MULTINIC/test.sh b/test/TEST-61-MULTINIC/test.sh
index 52eae65181d6a706b730e82744b23bd2f628b7ce..56efa50cef94484e3c8d326d4c8548a5678c74bc 100755 (executable)
--- a/test/TEST-61-MULTINIC/test.sh
+++ b/test/TEST-61-MULTINIC/test.sh
@@ -336,8 +336,7 @@ test_setup() {
     # Make client's dracut image
     test_dracut \
         --no-hostonly --no-hostonly-cmdline \
-        -a "${USE_NETWORK}" \
-        "$TESTDIR"/initramfs.testing
+        -a "${USE_NETWORK}"
 
     (
         # shellcheck disable=SC2031

diff --git a/test/TEST-62-BONDBRIDGEVLAN/test.sh b/test/TEST-62-BONDBRIDGEVLAN/test.sh
index 5bcbb574f4e73637f7dfbe4b11376873592ba75e..b4b81a7783e06689352853338a0e10fea14d389d 100755 (executable)
--- a/test/TEST-62-BONDBRIDGEVLAN/test.sh
+++ b/test/TEST-62-BONDBRIDGEVLAN/test.sh
@@ -378,8 +378,7 @@ test_setup() {
     # Make client's dracut image
     test_dracut \
         --no-hostonly --no-hostonly-cmdline \
-        -a "${USE_NETWORK} ifcfg ${DEBUGFAIL:+debug}" \
-        "$TESTDIR"/initramfs.testing
+        -a "${USE_NETWORK} ifcfg ${DEBUGFAIL:+debug}"
 
     (
         # shellcheck disable=SC2031

diff --git a/test/TEST-70-ISCSI/test.sh b/test/TEST-70-ISCSI/test.sh
index 503abb6f64dc7de8f8d93c1b809da13f5b34c204..4f54c883b0c9f60fc66c4fbdba2473eca88f4a3b 100755 (executable)
--- a/test/TEST-70-ISCSI/test.sh
+++ b/test/TEST-70-ISCSI/test.sh
@@ -218,8 +218,7 @@ test_setup() {
         --no-hostonly --no-hostonly-cmdline \
         --add "$USE_NETWORK" \
         --include "./client.link" "/etc/systemd/network/01-client.link" \
-        --kernel-cmdline "rw rd.auto" \
-        "$TESTDIR"/initramfs.testing
+        --kernel-cmdline "rw rd.auto"
 }
 
 test_cleanup() {

diff --git a/test/TEST-71-ISCSI-MULTI/test.sh b/test/TEST-71-ISCSI-MULTI/test.sh
index 3447abd974d7d166a3247325868c255bb11cf075..ed79d69c4df99e1d03ae99bcf7bafd93043e0c90 100755 (executable)
--- a/test/TEST-71-ISCSI-MULTI/test.sh
+++ b/test/TEST-71-ISCSI-MULTI/test.sh
@@ -223,8 +223,7 @@ test_setup() {
     test_dracut \
         --no-hostonly --no-hostonly-cmdline \
         --add "$USE_NETWORK" \
-        -i "./client.link" "/etc/systemd/network/01-client.link" \
-        "$TESTDIR"/initramfs.testing
+        -i "./client.link" "/etc/systemd/network/01-client.link"
 
     # Make server's dracut image
     "$DRACUT" -i "$TESTDIR"/overlay / \

diff --git a/test/TEST-72-NBD/test.sh b/test/TEST-72-NBD/test.sh
index a168fd950c13c1f65e621155fbfbf508423cd93b..946592e83ca5c36da3dfe4807731f826c058be87 100755 (executable)
--- a/test/TEST-72-NBD/test.sh
+++ b/test/TEST-72-NBD/test.sh
@@ -331,8 +331,7 @@ test_setup() {
         -a "${USE_NETWORK}" \
         -i "./client.link" "/etc/systemd/network/01-client.link" \
         -i "/tmp/crypttab" "/etc/crypttab" \
-        -i "/tmp/key" "/etc/key" \
-        "$TESTDIR"/initramfs.testing
+        -i "/tmp/key" "/etc/key"
 
     "$DRACUT" -N -i "$TESTDIR"/overlay / \
         -a "test network-legacy ${SERVER_DEBUG:+debug}" \

diff --git a/test/test-functions b/test/test-functions
index fe9eeaf63dd3e73ae102b056fb9a8fe7238207a4..db02cea85dbcecd888ff6bda2641494f2c2bbc1c 100644 (file)
--- a/test/test-functions
+++ b/test/test-functions
@@ -62,7 +62,7 @@ test_dracut() {
 
     "$DRACUT" \
         "${TEST_DRACUT_ARGS_ARRAY[@]}" \
-        "$@" || return 1
+        "$@" "$TESTDIR"/initramfs.testing || return 1
 }
 
 # Wait for the server QEMU has been started up.