public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/tests/installer: prevent race between parted and udev

Browse Source 
by combining all parted commands into a single parted call.
This eliminates one cause of non-deterministic failure.
This commit is contained in:
Uli Baum 2018-09-22 01:32:06 +02:00
parent 3748c250bb
commit a5183762c5
1 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
nixos/tests/installer.nix
View File

@ -282,9 +282,9 @@ in {
{ createPartitions = { createPartitions =
'' ''
$machine->succeed( $machine->succeed(
"parted --script /dev/vda mklabel msdos", "parted --script /dev/vda -- mklabel msdos"
"parted --script /dev/vda -- mkpart primary linux-swap 1M 1024M", . " mkpart primary linux-swap 1M 1024M"
"parted --script /dev/vda -- mkpart primary ext2 1024M -1s", . " mkpart primary ext2 1024M -1s",
"udevadm settle", "udevadm settle",
"mkswap /dev/vda1 -L swap", "mkswap /dev/vda1 -L swap",
"swapon -L swap", "swapon -L swap",
@ -299,11 +299,11 @@ in {
{ createPartitions = { createPartitions =
'' ''
$machine->succeed( $machine->succeed(
"parted --script /dev/vda mklabel gpt", "parted --script /dev/vda -- mklabel gpt"
"parted --script /dev/vda -- mkpart ESP fat32 1M 50MiB", # /boot . " mkpart ESP fat32 1M 50MiB" # /boot
"parted --script /dev/vda -- set 1 boot on", . " set 1 boot on"
"parted --script /dev/vda -- mkpart primary linux-swap 50MiB 1024MiB", . " mkpart primary linux-swap 50MiB 1024MiB"
"parted --script /dev/vda -- mkpart primary ext2 1024MiB -1MiB", # / . " mkpart primary ext2 1024MiB -1MiB", # /
"udevadm settle", "udevadm settle",
"mkswap /dev/vda2 -L swap", "mkswap /dev/vda2 -L swap",
"swapon -L swap", "swapon -L swap",
@ -321,11 +321,11 @@ in {
{ createPartitions = { createPartitions =
'' ''
$machine->succeed( $machine->succeed(
"parted --script /dev/vda mklabel gpt", "parted --script /dev/vda -- mklabel gpt"
"parted --script /dev/vda -- mkpart ESP fat32 1M 50MiB", # /boot . " mkpart ESP fat32 1M 50MiB" # /boot
"parted --script /dev/vda -- set 1 boot on", . " set 1 boot on"
"parted --script /dev/vda -- mkpart primary linux-swap 50MiB 1024MiB", . " mkpart primary linux-swap 50MiB 1024MiB"
"parted --script /dev/vda -- mkpart primary ext2 1024MiB -1MiB", # / . " mkpart primary ext2 1024MiB -1MiB", # /
"udevadm settle", "udevadm settle",
"mkswap /dev/vda2 -L swap", "mkswap /dev/vda2 -L swap",
"swapon -L swap", "swapon -L swap",
@ -345,10 +345,10 @@ in {
{ createPartitions = { createPartitions =
'' ''
$machine->succeed( $machine->succeed(
"parted --script /dev/vda mklabel msdos", "parted --script /dev/vda -- mklabel msdos"
"parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot . " mkpart primary ext2 1M 50MB" # /boot
"parted --script /dev/vda -- mkpart primary linux-swap 50MB 1024M", . " mkpart primary linux-swap 50MB 1024M"
"parted --script /dev/vda -- mkpart primary ext2 1024M -1s", # / . " mkpart primary ext2 1024M -1s", # /
"udevadm settle", "udevadm settle",
"mkswap /dev/vda2 -L swap", "mkswap /dev/vda2 -L swap",
"swapon -L swap", "swapon -L swap",
@ -366,10 +366,10 @@ in {
{ createPartitions = { createPartitions =
'' ''
$machine->succeed( $machine->succeed(
"parted --script /dev/vda mklabel msdos", "parted --script /dev/vda -- mklabel msdos"
"parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot . " mkpart primary ext2 1M 50MB" # /boot
"parted --script /dev/vda -- mkpart primary linux-swap 50MB 1024M", . " mkpart primary linux-swap 50MB 1024M"
"parted --script /dev/vda -- mkpart primary ext2 1024M -1s", # / . " mkpart primary ext2 1024M -1s", # /
"udevadm settle", "udevadm settle",
"mkswap /dev/vda2 -L swap", "mkswap /dev/vda2 -L swap",
"swapon -L swap", "swapon -L swap",
@ -402,9 +402,9 @@ in {
createPartitions = createPartitions =
'' ''
$machine->succeed( $machine->succeed(
"parted --script /dev/vda mklabel msdos", "parted --script /dev/vda -- mklabel msdos"
"parted --script /dev/vda -- mkpart primary linux-swap 1M 1024M", . " mkpart primary linux-swap 1M 1024M"
"parted --script /dev/vda -- mkpart primary 1024M -1s", . " mkpart primary 1024M -1s",
"udevadm settle", "udevadm settle",
"mkswap /dev/vda1 -L swap", "mkswap /dev/vda1 -L swap",
@ -425,11 +425,11 @@ in {
{ createPartitions = { createPartitions =
'' ''
$machine->succeed( $machine->succeed(
"parted --script /dev/vda mklabel msdos", "parted --script /dev/vda -- mklabel msdos"
"parted --script /dev/vda -- mkpart primary 1M 2048M", # PV1 . " mkpart primary 1M 2048M" # PV1
"parted --script /dev/vda -- set 1 lvm on", . " set 1 lvm on"
"parted --script /dev/vda -- mkpart primary 2048M -1s", # PV2 . " mkpart primary 2048M -1s" # PV2
"parted --script /dev/vda -- set 2 lvm on", . " set 2 lvm on",
"udevadm settle", "udevadm settle",
"pvcreate /dev/vda1 /dev/vda2", "pvcreate /dev/vda1 /dev/vda2",
"vgcreate MyVolGroup /dev/vda1 /dev/vda2", "vgcreate MyVolGroup /dev/vda1 /dev/vda2",
@ -447,10 +447,10 @@ in {
luksroot = makeInstallerTest "luksroot" luksroot = makeInstallerTest "luksroot"
{ createPartitions = '' { createPartitions = ''
$machine->succeed( $machine->succeed(
"parted --script /dev/vda mklabel msdos", "parted --script /dev/vda -- mklabel msdos"
"parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot . " mkpart primary ext2 1M 50MB" # /boot
"parted --script /dev/vda -- mkpart primary linux-swap 50M 1024M", . " mkpart primary linux-swap 50M 1024M"
"parted --script /dev/vda -- mkpart primary 1024M -1s", # LUKS . " mkpart primary 1024M -1s", # LUKS
"udevadm settle", "udevadm settle",
"mkswap /dev/vda2 -L swap", "mkswap /dev/vda2 -L swap",
"swapon -L swap", "swapon -L swap",
@ -481,11 +481,11 @@ in {
filesystemEncryptedWithKeyfile = makeInstallerTest "filesystemEncryptedWithKeyfile" filesystemEncryptedWithKeyfile = makeInstallerTest "filesystemEncryptedWithKeyfile"
{ createPartitions = '' { createPartitions = ''
$machine->succeed( $machine->succeed(
"parted --script /dev/vda mklabel msdos", "parted --script /dev/vda -- mklabel msdos"
"parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot . " mkpart primary ext2 1M 50MB" # /boot
"parted --script /dev/vda -- mkpart primary linux-swap 50M 1024M", . " mkpart primary linux-swap 50M 1024M"
"parted --script /dev/vda -- mkpart primary 1024M 1280M", # LUKS with keyfile . " mkpart primary 1024M 1280M" # LUKS with keyfile
"parted --script /dev/vda -- mkpart primary 1280M -1s", . " mkpart primary 1280M -1s",
"udevadm settle", "udevadm settle",
"mkswap /dev/vda2 -L swap", "mkswap /dev/vda2 -L swap",
"swapon -L swap", "swapon -L swap",
@ -555,9 +555,9 @@ in {
{ createPartitions = { createPartitions =
'' ''
$machine->succeed( $machine->succeed(
"parted --script /dev/sda mklabel msdos", "parted --script /dev/sda -- mklabel msdos"
"parted --script /dev/sda -- mkpart primary linux-swap 1M 1024M", . " mkpart primary linux-swap 1M 1024M"
"parted --script /dev/sda -- mkpart primary ext2 1024M -1s", . " mkpart primary ext2 1024M -1s",
"udevadm settle", "udevadm settle",
"mkswap /dev/sda1 -L swap", "mkswap /dev/sda1 -L swap",
"swapon -L swap", "swapon -L swap",