test(ENC-RAID-LVM): simplify raid configuration

Use two (instead of three) drives for the raid to speculativly
improve the stability of this tests.
It has been randomly failing on the CI.

diff --git a/test/TEST-26-ENC-RAID-LVM/create-root.sh b/test/TEST-26-ENC-RAID-LVM/create-root.sh
index d9aef6f468e6591fd61e8e5383f294dd9bdbc439..56996d821b393149ed10e78eec792dad2f7c5c0a 100755 (executable)
--- a/test/TEST-26-ENC-RAID-LVM/create-root.sh
+++ b/test/TEST-26-ENC-RAID-LVM/create-root.sh
@@ -5,11 +5,9 @@ set -ex
 printf test > keyfile
 cryptsetup -q luksFormat /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_disk1 /keyfile
 cryptsetup -q luksFormat /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_disk2 /keyfile
-cryptsetup -q luksFormat /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_disk3 /keyfile
 cryptsetup luksOpen /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_disk1 dracut_disk1 < /keyfile
 cryptsetup luksOpen /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_disk2 dracut_disk2 < /keyfile
-cryptsetup luksOpen /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_disk3 dracut_disk3 < /keyfile
-mdadm --create /dev/md0 --run --auto=yes --level=5 --raid-devices=3 /dev/mapper/dracut_disk1 /dev/mapper/dracut_disk2 /dev/mapper/dracut_disk3
+mdadm --create /dev/md0 --run --auto=yes --level=1 --metadata=0.90 --raid-devices=2 /dev/mapper/dracut_disk1 /dev/mapper/dracut_disk2
 # wait for the array to finish initializing, otherwise this sometimes fails
 # randomly.
 mdadm -W /dev/md0
@@ -28,7 +26,6 @@ mdadm -W /dev/md0 || :
 mdadm --stop /dev/md0
 cryptsetup luksClose /dev/mapper/dracut_disk1
 cryptsetup luksClose /dev/mapper/dracut_disk2
-cryptsetup luksClose /dev/mapper/dracut_disk3
 
 {
     echo "dracut-root-block-created"

diff --git a/test/TEST-26-ENC-RAID-LVM/test.sh b/test/TEST-26-ENC-RAID-LVM/test.sh
index 2f357b23a842d80a99a90f63fbf3f46e6c929a30..6ba637cb8fff7b6bb99dde9d2e51535cf3395a7e 100755 (executable)
--- a/test/TEST-26-ENC-RAID-LVM/test.sh
+++ b/test/TEST-26-ENC-RAID-LVM/test.sh
@@ -29,7 +29,6 @@ test_run() {
     qemu_add_drive disk_index disk_args "$TESTDIR"/marker.img marker
     qemu_add_drive disk_index disk_args "$TESTDIR"/disk-1.img disk1
     qemu_add_drive disk_index disk_args "$TESTDIR"/disk-2.img disk2
-    qemu_add_drive disk_index disk_args "$TESTDIR"/disk-3.img disk3
 
     test_marker_reset
     "$testdir"/run-qemu \
@@ -77,7 +76,6 @@ test_setup() {
     qemu_add_drive disk_index disk_args "$TESTDIR"/marker.img marker 1
     qemu_add_drive disk_index disk_args "$TESTDIR"/disk-1.img disk1 1
     qemu_add_drive disk_index disk_args "$TESTDIR"/disk-2.img disk2 1
-    qemu_add_drive disk_index disk_args "$TESTDIR"/disk-3.img disk3 1
 
     "$testdir"/run-qemu \
         "${disk_args[@]}" \