diff --git a/nixos/release.nix b/nixos/release.nix index 0620b46d46a..f78ecb4383d 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -228,6 +228,10 @@ in rec { tests.installer.rebuildCD = forAllSystems (system: (import tests/installer.nix { inherit system; }).rebuildCD.test); tests.installer.separateBoot = forAllSystems (system: (import tests/installer.nix { inherit system; }).separateBoot.test); tests.installer.simple = forAllSystems (system: (import tests/installer.nix { inherit system; }).simple.test); + tests.installer.simpleLabels = forAllSystems (system: (import tests/installer.nix { inherit system; }).simpleLabels.test); + tests.installer.simpleProvided = forAllSystems (system: (import tests/installer.nix { inherit system; }).simpleProvided.test); + tests.installer.btrfsSimple = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSimple.test); + tests.installer.btrfsSubvols = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSubvols.test); tests.influxdb = callTest tests/influxdb.nix {}; tests.ipv6 = callTest tests/ipv6.nix {}; tests.jenkins = callTest tests/jenkins.nix {}; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index ef11fcb1001..154f3323d29 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -397,7 +397,7 @@ in { }; # Test using labels to identify volumes in grub - simpleLabels = makeInstallerTest { + simpleLabels = makeInstallerTest "simpleLabels" { createPartitions = '' $machine->succeed( "sgdisk -Z /dev/vda", @@ -413,7 +413,7 @@ in { # Test using the provided disk name within grub # TODO: Fix udev so the symlinks are unneeded in /dev/disks - simpleProvided = makeInstallerTest { + simpleProvided = makeInstallerTest "simpleProvided" { createPartitions = '' my $UUID = "\$(blkid -s UUID -o value /dev/vda2)"; $machine->succeed( @@ -436,7 +436,7 @@ in { }; # Simple btrfs grub testing - btrfsSimple = makeInstallerTest { + btrfsSimple = makeInstallerTest "btrfsSimple" { createPartitions = '' $machine->succeed( "sgdisk -Z /dev/vda", @@ -450,7 +450,7 @@ in { }; # Test to see if we can detect /boot and /nix on subvolumes - btrfsSubvols = makeInstallerTest { + btrfsSubvols = makeInstallerTest "btrfsSubvols" { createPartitions = '' $machine->succeed( "sgdisk -Z /dev/vda",