From de50df482eed28288625e75487da1b617ef32c1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 2 Sep 2023 13:57:52 +0200
Subject: [PATCH 1/2] do not set networking.hostId in vm tests by default

This will conflict with the user defaults otherwise
---
 lib/tests.nix             | 1 -
 tests/cli.nix             | 1 +
 tests/complex.nix         | 1 +
 tests/module.nix          | 1 +
 tests/zfs-over-legacy.nix | 3 +++
 tests/zfs.nix             | 1 +
 6 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/tests.nix b/lib/tests.nix
index 752939d..3012ec3 100644
--- a/lib/tests.nix
+++ b/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
           '';
diff --git a/tests/cli.nix b/tests/cli.nix
index 24135cd..837ea56 100644
--- a/tests/cli.nix
+++ b/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!
   };
   testMode = "direct";
diff --git a/tests/complex.nix b/tests/complex.nix
index 573503f..f605096 100644
--- a/tests/complex.nix
+++ b/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!
   };
   extraTestScript = ''
diff --git a/tests/module.nix b/tests/module.nix
index 6c412d8..3ccba50 100644
--- a/tests/module.nix
+++ b/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";
diff --git a/tests/zfs-over-legacy.nix b/tests/zfs-over-legacy.nix
index 722c6c1..1e4162f 100644
--- a/tests/zfs-over-legacy.nix
+++ b/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");
diff --git a/tests/zfs.nix b/tests/zfs.nix
index 5620270..b024a13 100644
--- a/tests/zfs.nix
+++ b/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 = ''

From 78856a26b65e041f120c1015f8177e3a2c7cbb1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 2 Sep 2023 14:18:17 +0200
Subject: [PATCH 2/2] mergify: switch to buildbot

---
 .mergify.yml | 32 +-------------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index 98221cf..04c710b 100644
--- a/.mergify.yml
+++ b/.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: