ci: remove unnecessary workarounds

jozzsi · Nov 17, 2024 · ac9cbe0 · ac9cbe0
1 parent 8631284
commit ac9cbe0
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 20 deletions.
diff --git a/test/TEST-20-STORAGE/cryptroot-ask.sh b/test/TEST-20-STORAGE/cryptroot-ask.sh
diff --git a/test/TEST-20-STORAGE/test.sh b/test/TEST-20-STORAGE/test.sh
@@ -150,7 +150,6 @@ test_setup() {
 
         eval "$(grep -F --binary-files=text -m 1 MD_UUID "$TESTDIR"/marker.img)"
         echo "$MD_UUID" > "$TESTDIR"/mduuid
-        echo "ARRAY /dev/md0 level=raid1 num-devices=2 UUID=$MD_UUID" > /tmp/mdadm.conf
 
         eval "$(grep -F -a -m 1 ID_FS_UUID "$TESTDIR"/marker.img)"
         echo "$ID_FS_UUID" > "$TESTDIR"/luksuuid
@@ -165,8 +164,6 @@ test_setup() {
         $(if command -v mdadm > /dev/null; then echo "-a mdraid"; fi) \
         $(if command -v cryptsetup > /dev/null; then echo "-a crypt"; fi) \
         $(if [ "$TEST_FSTYPE" = "zfs" ]; then echo "-a zfs"; fi) \
-        -i "/tmp/mdadm.conf" "/etc/mdadm.conf" \
-        -i "./cryptroot-ask.sh" "/sbin/cryptroot-ask" \
         -i "/tmp/crypttab" "/etc/crypttab" \
         -i "/tmp/key" "/etc/key" \
         "$TESTDIR"/initramfs.testing

diff --git a/test/TEST-26-ENC-RAID-LVM/cryptroot-ask.sh b/test/TEST-26-ENC-RAID-LVM/cryptroot-ask.sh
diff --git a/test/TEST-26-ENC-RAID-LVM/test.sh b/test/TEST-26-ENC-RAID-LVM/test.sh
@@ -101,7 +101,6 @@ test_setup() {
 
     test_dracut \
         -a "crypt lvm mdraid" \
-        -i "./cryptroot-ask.sh" "/sbin/cryptroot-ask" \
         -i "/tmp/crypttab" "/etc/crypttab" \
         -i "/tmp/key" "/etc/key" \
         "$TESTDIR"/initramfs.testing

diff --git a/test/TEST-72-NBD/cryptroot-ask.sh b/test/TEST-72-NBD/cryptroot-ask.sh
diff --git a/test/TEST-72-NBD/test.sh b/test/TEST-72-NBD/test.sh
@@ -337,7 +337,6 @@ test_setup() {
     test_dracut \
         --no-hostonly --no-hostonly-cmdline \
         -a "${USE_NETWORK}" \
-        -i "./cryptroot-ask.sh" "/sbin/cryptroot-ask" \
         -i "./client.link" "/etc/systemd/network/01-client.link" \
         -i "/tmp/crypttab" "/etc/crypttab" \
         -i "/tmp/key" "/etc/key" \