Merge pull request #341 from nix-community/zfs-hostid

do not set networking.hostId in vm tests by default

.mergify.yml

@@ -1,37 +1,7 @@
 queue_rules:
   - name: default
     merge_conditions:
-      - check-success=Evaluate flake.nix
-      - check-success=check bcachefs [x86_64-linux]
-      - check-success=check boot-raid1 [x86_64-linux]
-      - check-success=check btrfs-subvolumes [x86_64-linux]
-      - check-success=check cli [x86_64-linux]
-      - check-success=check complex [x86_64-linux]
-      - check-success=check gpt-bios-compat [x86_64-linux]
-      - check-success=check hybrid [x86_64-linux]
-      - check-success=check hybrid-tmpfs-on-root [x86_64-linux]
-      - check-success=check legacy-table [x86_64-linux]
-      - check-success=check luks-btrfs-subvolumes [x86_64-linux]
-      - check-success=check luks-lvm [x86_64-linux]
-      - check-success=check lvm-raid [x86_64-linux]
-      - check-success=check lvm-sizes-sort [x86_64-linux]
-      - check-success=check make-disk-image [x86_64-linux]
-      - check-success=check make-disk-image-impure [x86_64-linux]
-      - check-success=check mdadm [x86_64-linux]
-      - check-success=check module [x86_64-linux]
-      - check-success=check multi-device-no-deps [x86_64-linux]
-      - check-success=check negative-size [x86_64-linux]
-      - check-success=check shellcheck [x86_64-linux]
-      - check-success=check simple-efi [x86_64-linux]
-      - check-success=check standalone [x86_64-linux]
-      - check-success=check swap [x86_64-linux]
-      - check-success=check tmpfs [x86_64-linux]
-      - check-success=check with-lib [x86_64-linux]
-      - check-success=check zfs [x86_64-linux]
-      - check-success=check zfs-over-legacy [x86_64-linux]
-      - check-success=package default [x86_64-linux]
-      - check-success=package disko [x86_64-linux]
-      - check-success=package disko-doc [x86_64-linux]
+      - check-success=buildbot/nix-eval
 defaults:
   actions:
     queue:

lib/tests.nix

@@ -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
           '';

tests/cli.nix

@@ -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!
     fileSystems."/zfs_fs".options = [ "nofail" ]; # TODO find out why we need this!
   };

tests/complex.nix

@@ -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!
     fileSystems."/zfs_fs".options = [ "nofail" ]; # TODO find out why we need this!
   };

tests/module.nix

@@ -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";

tests/zfs-over-legacy.nix

@@ -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");

tests/zfs.nix

@@ -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 = ''