ci: wait for udev before doing sfdisk

might be responsible for some flakiness

diff --git a/test/TEST-03-USR-MOUNT/create-root.sh b/test/TEST-03-USR-MOUNT/create-root.sh
index 238fad06a0da4c7810627817446c0d445134feb1..b2f885dcb1a6bd2cf983b37ab07b3173a5249cb5 100755 (executable)
--- a/test/TEST-03-USR-MOUNT/create-root.sh
+++ b/test/TEST-03-USR-MOUNT/create-root.sh
@@ -6,6 +6,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
 done
 rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
+udevadm settle
 set -e
 # save a partition at the beginning for future flagging purposes
 sfdisk /dev/sda <<EOF

diff --git a/test/TEST-04-FULL-SYSTEMD/create-root.sh b/test/TEST-04-FULL-SYSTEMD/create-root.sh
index 5de376c70e5c6d64c1ddc19b8e56d6fef56d24ea..ef4cf50423b4919b4a3b35923b014488dece33ff 100755 (executable)
--- a/test/TEST-04-FULL-SYSTEMD/create-root.sh
+++ b/test/TEST-04-FULL-SYSTEMD/create-root.sh
@@ -7,6 +7,7 @@ done
 rm -f -- /etc/lvm/lvm.conf
 modprobe btrfs
 udevadm control --reload
+udevadm settle
 set -e
 # save a partition at the beginning for future flagging purposes
 sfdisk /dev/sda <<EOF

diff --git a/test/TEST-10-RAID/create-root.sh b/test/TEST-10-RAID/create-root.sh
index e7bb3ef9e1fa1e6f6987c2b85b8939d3274d96ec..b4415994a7ce6b6a2d2f3b75375324f5caa13fe5 100755 (executable)
--- a/test/TEST-10-RAID/create-root.sh
+++ b/test/TEST-10-RAID/create-root.sh
@@ -5,6 +5,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
 done
 rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
+udevadm settle
 # save a partition at the beginning for future flagging purposes
 sfdisk /dev/sda <<EOF
 ,4M

diff --git a/test/TEST-11-LVM/create-root.sh b/test/TEST-11-LVM/create-root.sh
index 7fbef295e2868c24de938d39f16bfe14df83df5b..3da501f2561301af234f5def307adf010a286d23 100755 (executable)
--- a/test/TEST-11-LVM/create-root.sh
+++ b/test/TEST-11-LVM/create-root.sh
@@ -5,6 +5,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
 done
 rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
+udevadm settle
 # save a partition at the beginning for future flagging purposes
 sfdisk /dev/sda <<EOF
 ,2M

diff --git a/test/TEST-13-ENC-RAID-LVM/create-root.sh b/test/TEST-13-ENC-RAID-LVM/create-root.sh
index 437f0fb29187c2e4443fe11dc9d351170e8c355f..a09b3bee6a96ae6661eaef69a6a8cad2c576bb46 100755 (executable)
--- a/test/TEST-13-ENC-RAID-LVM/create-root.sh
+++ b/test/TEST-13-ENC-RAID-LVM/create-root.sh
@@ -6,6 +6,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
 done
 rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
+udevadm settle
 # save a partition at the beginning for future flagging purposes
 sfdisk /dev/sda <<EOF
 ,4M

diff --git a/test/TEST-14-IMSM/create-root.sh b/test/TEST-14-IMSM/create-root.sh
index 9b6517fb8e3500b951e0f84576ce47f708006903..afa2f3a2261d092a80736510d22dfedca8137d43 100755 (executable)
--- a/test/TEST-14-IMSM/create-root.sh
+++ b/test/TEST-14-IMSM/create-root.sh
@@ -9,6 +9,8 @@ done
 rm -f -- /etc/lvm/lvm.conf
 
 udevadm control --reload
+udevadm settle
+
 # dmraid does not want symlinks in --disk "..."
 if [ -e /dev/hda ] ; then
     echo y|dmraid -f isw -C Test0 --type 1 --disk "/dev/hdb /dev/hdc"

diff --git a/test/TEST-15-BTRFSRAID/create-root.sh b/test/TEST-15-BTRFSRAID/create-root.sh
index 4d0bf2eb26cc814956cd702ab53485b2c1bb34d2..85faeb6ccebb5f3af02903357f451b92556e2582 100755 (executable)
--- a/test/TEST-15-BTRFSRAID/create-root.sh
+++ b/test/TEST-15-BTRFSRAID/create-root.sh
@@ -5,6 +5,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
 done
 modprobe btrfs
 udevadm control --reload
+udevadm settle
 # save a partition at the beginning for future flagging purposes
 sfdisk -X gpt /dev/sda <<EOF
 ,10M

diff --git a/test/TEST-17-LVM-THIN/create-root.sh b/test/TEST-17-LVM-THIN/create-root.sh
index 01f0a1191b3c612523a99b0e4dd6f141c6d6f8ca..6679125db9e827a735da5518acc9b3445ece268f 100755 (executable)
--- a/test/TEST-17-LVM-THIN/create-root.sh
+++ b/test/TEST-17-LVM-THIN/create-root.sh
@@ -5,6 +5,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
 done
 rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
+udevadm settle
 # save a partition at the beginning for future flagging purposes
 sfdisk /dev/sda <<EOF
 ,4M

diff --git a/test/TEST-20-NFS/create-root.sh b/test/TEST-20-NFS/create-root.sh
index 97071fa356dabccb21f33dd4d9f8fdc2a852136f..05b2ae4b287984d95f6c0ca5832fc478acbe7ba7 100755 (executable)
--- a/test/TEST-20-NFS/create-root.sh
+++ b/test/TEST-20-NFS/create-root.sh
@@ -5,6 +5,8 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
 done
 rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
+udevadm settle
+
 set -e
 # save a partition at the beginning for future flagging purposes
 sfdisk /dev/sda <<EOF

diff --git a/test/TEST-30-ISCSI/create-client-root.sh b/test/TEST-30-ISCSI/create-client-root.sh
index d44c35762024355e9232f813d4bde7643ab7f4b6..de14e794e84ac23c9d5e36c56b2d4ed66c237d2f 100755 (executable)
--- a/test/TEST-30-ISCSI/create-client-root.sh
+++ b/test/TEST-30-ISCSI/create-client-root.sh
@@ -5,6 +5,8 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
 done
 rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
+udevadm settle
+
 mkfs.ext3 -j -L singleroot -F /dev/sda && \
 mkdir -p /sysroot && \
 mount /dev/sda /sysroot && \

diff --git a/test/TEST-30-ISCSI/create-server-root.sh b/test/TEST-30-ISCSI/create-server-root.sh
index 97071fa356dabccb21f33dd4d9f8fdc2a852136f..cae305f9c399078349879464c1caab7855e992a9 100755 (executable)
--- a/test/TEST-30-ISCSI/create-server-root.sh
+++ b/test/TEST-30-ISCSI/create-server-root.sh
@@ -5,6 +5,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
 done
 rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
+udevadm settle
 set -e
 # save a partition at the beginning for future flagging purposes
 sfdisk /dev/sda <<EOF

diff --git a/test/TEST-35-ISCSI-MULTI/create-client-root.sh b/test/TEST-35-ISCSI-MULTI/create-client-root.sh
index d44c35762024355e9232f813d4bde7643ab7f4b6..de14e794e84ac23c9d5e36c56b2d4ed66c237d2f 100755 (executable)
--- a/test/TEST-35-ISCSI-MULTI/create-client-root.sh
+++ b/test/TEST-35-ISCSI-MULTI/create-client-root.sh
@@ -5,6 +5,8 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
 done
 rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
+udevadm settle
+
 mkfs.ext3 -j -L singleroot -F /dev/sda && \
 mkdir -p /sysroot && \
 mount /dev/sda /sysroot && \

diff --git a/test/TEST-35-ISCSI-MULTI/create-server-root.sh b/test/TEST-35-ISCSI-MULTI/create-server-root.sh
index 97071fa356dabccb21f33dd4d9f8fdc2a852136f..cae305f9c399078349879464c1caab7855e992a9 100755 (executable)
--- a/test/TEST-35-ISCSI-MULTI/create-server-root.sh
+++ b/test/TEST-35-ISCSI-MULTI/create-server-root.sh
@@ -5,6 +5,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
 done
 rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
+udevadm settle
 set -e
 # save a partition at the beginning for future flagging purposes
 sfdisk /dev/sda <<EOF

diff --git a/test/TEST-40-NBD/create-client-root.sh b/test/TEST-40-NBD/create-client-root.sh
index 893763a170b572b148b53e73ab0cd4278ffa3cd1..d752a7fe54224ca640a54f7555fd77e64ed394d3 100755 (executable)
--- a/test/TEST-40-NBD/create-client-root.sh
+++ b/test/TEST-40-NBD/create-client-root.sh
@@ -5,6 +5,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
 done
 rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
+udevadm settle
 set -e
 
 udevadm settle

diff --git a/test/TEST-40-NBD/create-encrypted-root.sh b/test/TEST-40-NBD/create-encrypted-root.sh
index f019d7c7dc8dad7ff3809c05751935df85fcae58..1e9495d702ad3e14c916f6eddcfc3dcadcf6541d 100755 (executable)
--- a/test/TEST-40-NBD/create-encrypted-root.sh
+++ b/test/TEST-40-NBD/create-encrypted-root.sh
@@ -5,6 +5,8 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
 done
 rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
+udevadm settle
+
 printf test >keyfile
 cryptsetup -q luksFormat /dev/sda /keyfile
 echo "The passphrase is test"

diff --git a/test/TEST-40-NBD/create-server-root.sh b/test/TEST-40-NBD/create-server-root.sh
index 893763a170b572b148b53e73ab0cd4278ffa3cd1..d752a7fe54224ca640a54f7555fd77e64ed394d3 100755 (executable)
--- a/test/TEST-40-NBD/create-server-root.sh
+++ b/test/TEST-40-NBD/create-server-root.sh
@@ -5,6 +5,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
 done
 rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
+udevadm settle
 set -e
 
 udevadm settle

diff --git a/test/TEST-50-MULTINIC/create-root.sh b/test/TEST-50-MULTINIC/create-root.sh
index 97071fa356dabccb21f33dd4d9f8fdc2a852136f..cae305f9c399078349879464c1caab7855e992a9 100755 (executable)
--- a/test/TEST-50-MULTINIC/create-root.sh
+++ b/test/TEST-50-MULTINIC/create-root.sh
@@ -5,6 +5,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
 done
 rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
+udevadm settle
 set -e
 # save a partition at the beginning for future flagging purposes
 sfdisk /dev/sda <<EOF

diff --git a/test/TEST-60-BONDBRIDGEVLANIFCFG/create-root.sh b/test/TEST-60-BONDBRIDGEVLANIFCFG/create-root.sh
index 97071fa356dabccb21f33dd4d9f8fdc2a852136f..cae305f9c399078349879464c1caab7855e992a9 100755 (executable)
--- a/test/TEST-60-BONDBRIDGEVLANIFCFG/create-root.sh
+++ b/test/TEST-60-BONDBRIDGEVLANIFCFG/create-root.sh
@@ -5,6 +5,7 @@ for x in 64-lvm.rules 70-mdadm.rules 99-mount-rules; do
 done
 rm -f -- /etc/lvm/lvm.conf
 udevadm control --reload
+udevadm settle
 set -e
 # save a partition at the beginning for future flagging purposes
 sfdisk /dev/sda <<EOF