do not set networking.hostId in vm tests by default

This will conflict with the user defaults otherwise
This commit is contained in:
Jörg Thalheim 2023-09-02 13:57:52 +02:00
parent 4eed2457b0
commit de50df482e
6 changed files with 7 additions and 1 deletions

View File

@ -101,7 +101,6 @@ let
# config for tests to make them run faster or work at all
documentation.enable = false;
hardware.enableAllFirmware = lib.mkForce false;
networking.hostId = "8425e349"; # from profiles/base.nix, needed for zfs
boot.initrd.preDeviceCommands = ''
echo -n 'secretsecret' > /tmp/secret.key
'';

View File

@ -6,6 +6,7 @@ diskoLib.testLib.makeDiskoTest {
name = "cli";
disko-config = ../example/complex.nix;
extraSystemConfig = {
networking.hostId = "8425e349";
fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this!
};
testMode = "direct";

View File

@ -6,6 +6,7 @@ diskoLib.testLib.makeDiskoTest {
name = "complex";
disko-config = ../example/complex.nix;
extraSystemConfig = {
networking.hostId = "8425e349";
fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this!
};
extraTestScript = ''

View File

@ -6,6 +6,7 @@ diskoLib.testLib.makeDiskoTest {
name = "module";
disko-config = ../example/complex.nix;
extraSystemConfig = {
networking.hostId = "8425e349";
fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this!
};
testMode = "module";

View File

@ -4,6 +4,9 @@
diskoLib.testLib.makeDiskoTest {
inherit pkgs;
name = "zfs-over-legacy";
extraSystemConfig = {
networking.hostId = "8425e349";
};
disko-config = ../example/zfs-over-legacy.nix;
extraTestScript = ''
machine.succeed("test -e /zfs_fs");

View File

@ -6,6 +6,7 @@ diskoLib.testLib.makeDiskoTest {
name = "zfs";
disko-config = ../example/zfs.nix;
extraSystemConfig = {
networking.hostId = "8425e349";
fileSystems."/zfs_legacy_fs".options = [ "nofail" ]; # TODO find out why we need this!
};
extraTestScript = ''