From 3f4a6c7a229b8d9c7a21c8987f4c445aa8c2d5e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 21 Jan 2023 00:44:41 +0100
Subject: [PATCH] hydra: use gallium, disable binfmt container

---
 hosts/hydra/default.nix | 58 ++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/hosts/hydra/default.nix b/hosts/hydra/default.nix
index f1c57981..724ee9f3 100644
--- a/hosts/hydra/default.nix
+++ b/hosts/hydra/default.nix
@@ -59,30 +59,30 @@ in
   nixpkgs.config.allowUnfree = true;
 
   containers = {
-    hydra-binfmt-builder = {
-      autoStart = true;
-      config = { ... }: {
-        imports = [ (modulesPath + "/profiles/minimal.nix") ];
+    # hydra-binfmt-builder = {
+    #   autoStart = true;
+    #   config = { ... }: {
+    #     imports = [ (modulesPath + "/profiles/minimal.nix") ];
 
-        networking.firewall.allowedTCPPorts = [ 22 ];
+    #     networking.firewall.allowedTCPPorts = [ 22 ];
 
-        nix = {
-          settings = config.nix.settings;
-          extraOptions = config.nix.extraOptions;
-        };
+    #     nix = {
+    #       settings = config.nix.settings;
+    #       extraOptions = config.nix.extraOptions;
+    #     };
 
-        services.openssh.enable = true;
+    #     services.openssh.enable = true;
 
-        system.stateVersion = "22.11";
+    #     system.stateVersion = "22.11";
 
-        users.users."root".openssh.authorizedKeys.keys = [
-          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBga6vW8lnbFKl+Yd2xBiF71FRyV14eDUnqcMc2AWifI root@hydra"
-        ];
-      };
-      hostAddress = "192.168.100.1";
-      localAddress = "192.168.100.3";
-      privateNetwork = true;
-    };
+    #     users.users."root".openssh.authorizedKeys.keys = [
+    #       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBga6vW8lnbFKl+Yd2xBiF71FRyV14eDUnqcMc2AWifI root@hydra"
+    #     ];
+    #   };
+    #   hostAddress = "192.168.100.1";
+    #   localAddress = "192.168.100.3";
+    #   privateNetwork = true;
+    # };
 
   #   disabled because currently it display `ARRAY(0x4ec2040)` on the website and also uses a perl array in store paths instead of /nix/store
   #   hydra-ca = {
@@ -137,11 +137,11 @@ in
     hostName = "hydra";
     firewall.enable = false;
     nameservers = [ "172.20.73.8" "9.9.9.9" ];
-    nat = {
-      enable = true;
-      externalInterface = "serv";
-      internalInterfaces = [ "ve-hydra-biLqAU" ];
-    };
+    # nat = {
+    #   enable = true;
+    #   externalInterface = "serv";
+    #   internalInterfaces = [ "ve-hydra-biLqAU" ];
+    # };
   };
 
   programs.ssh.knownHosts = lib.mkMerge [
@@ -302,10 +302,6 @@ in
     };
 
     hydra-init.preStart = let
-      makesSenseForQemuUser = feature: !(builtins.elem feature [ "kvm" "benchmark" ]);
-      # strips features that don't make sense on qemu-user
-      extraPlatformSystemFeatures = builtins.filter makesSenseForQemuUser config.nix.settings.system-features;
-
       localPlatforms = feature: !(builtins.elem feature [ "x86_64-linux" "i686-linux" ]);
       # strips features that don't make sense on qemu-user
       extraPlatforms = builtins.filter localPlatforms config.nix.settings.extra-platforms;
@@ -315,7 +311,11 @@ in
     ''
       cat << EOF > ~/machines
       localhost x86_64-linux,i686-linux - ${toString config.nix.settings.max-jobs} 10 ${lib.concatStringsSep "," config.nix.settings.system-features} -
-      root@192.168.100.3 ${lib.concatStringsSep "," extraPlatforms} - ${toString (config.nix.settings.max-jobs * 3)} 10 ${lib.concatStringsSep "," extraPlatformSystemFeatures} -
+      # local container to have an extra nix daemon for binfmt
+      # NOTE: currently very, very slow and usually builds do not finish in any amount of time
+      # root@192.168.100.3 ${lib.concatStringsSep "," extraPlatforms} - ${toString (config.nix.settings.max-jobs * 3)} 10 big-parallel,nixos-test -
+      # sandro's native aarch64 builder
+      root@gallium.supersandro.de aarch64-linux - 4 20 kvm,big-parallel,nixos-test,benchmark -
       EOF
     '';