From 4b8a678873e40a648cceb8ddca4900bcd3d1576f Mon Sep 17 00:00:00 2001 From: clerie Date: Sun, 16 Apr 2023 16:17:13 +0200 Subject: [PATCH] hosts/hydra-*: enable ARM build on hydra --- hosts/hydra-1/configuration.nix | 31 ++++++++++++++++++++++++++++++- hosts/hydra-2/configuration.nix | 6 ++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/hosts/hydra-1/configuration.nix b/hosts/hydra-1/configuration.nix index 379b42c..568a400 100644 --- a/hosts/hydra-1/configuration.nix +++ b/hosts/hydra-1/configuration.nix @@ -10,6 +10,12 @@ boot.loader.grub.enable = true; boot.loader.grub.version = 2; boot.loader.grub.device = "/dev/vda"; + + boot.binfmt.emulatedSystems = [ + "armv6l-linux" + "armv7l-linux" + "aarch64-linux" + ]; networking.hostName = "hydra-1"; @@ -24,18 +30,41 @@ settings.allowed-uris = "http:// https://"; distributedBuilds = true; buildMachines = [ + { + hostName = "hydra-1.net.clerie.de"; + sshUser = "root"; + systems = [ + "x86_64-linux" + "armv6l-linux" + "armv7l-linux" + "aarch64-linux" + ]; + sshKey = "/var/lib/hydra/id_ed25519"; + publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUUyeFFCQ3NGQkN3TDluNE9QL2JQbmd0Tk8xZnk5a1B3MTNaL05Eb2JhMTYgcm9vdEBoeWRyYS0xCg=="; + + } { hostName = "hydra-2.net.clerie.de"; sshUser = "root"; - system = "x86_64-linux"; + systems = [ + "x86_64-linux" + "armv6l-linux" + "armv7l-linux" + "aarch64-linux" + ]; sshKey = "/var/lib/hydra/id_ed25519"; publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSURaRUQ5UU0rcWU3c0I2UjZhdHZQNldOYUkyc0Mybmg3VFRzRDZrZ1JwbnIgcm9vdEBoeWRyYS0yCg=="; } ]; }; + programs.ssh.knownHosts."hydra-1.net.clerie.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE2xQBCsFBCwL9n4OP/bPngtNO1fy9kPw13Z/NDoba16 root@hydra-1"; programs.ssh.knownHosts."hydra-2.net.clerie.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDZED9QM+qe7sB6R6atvP6WNaI2sC2nh7TTsD6kgRpnr root@hydra-2"; + users.extraUsers.root.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMv8Lbca/CR4das3HJ2F/sQ9dA7kdGS1hSVTt5lX4diP root@hydra-1" + ]; + services.hydra = { enable = true; port = 3001; diff --git a/hosts/hydra-2/configuration.nix b/hosts/hydra-2/configuration.nix index b62e046..43730af 100644 --- a/hosts/hydra-2/configuration.nix +++ b/hosts/hydra-2/configuration.nix @@ -11,6 +11,12 @@ boot.loader.grub.version = 2; boot.loader.grub.device = "/dev/vda"; + boot.binfmt.emulatedSystems = [ + "armv6l-linux" + "armv7l-linux" + "aarch64-linux" + ]; + networking.hostName = "hydra-2"; networking.useDHCP = false;