From a3d92eceddc8fbc4848fe8f8528278e63673d60e Mon Sep 17 00:00:00 2001 From: emily Date: Sun, 3 Nov 2024 14:31:55 +0100 Subject: [PATCH] hydra: add riscv64 build worker --- config/services/hydra/nix-config.nix | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/config/services/hydra/nix-config.nix b/config/services/hydra/nix-config.nix index b4a2faa..6d7c579 100644 --- a/config/services/hydra/nix-config.nix +++ b/config/services/hydra/nix-config.nix @@ -22,12 +22,21 @@ { hostName = "schrodinger.kyouma.net"; sshUser = "root"; - maxJobs = 2; + maxJobs = 0; speedFactor = 20; systems = [ "riscv64-linux" ]; supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" ]; sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path; } + { + hostName = "machine-0008.cloud-v.co"; + sshUser = "root"; + maxJobs = 2; + speedFactor = 4; + systems = [ "riscv64-linux" ]; + supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" ]; + sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path; + } ] ++ lib.forEach (lib.genList (i: i + 1) 8) (num: { hostName = "build-worker-0${toString num}"; sshUser = "root"; @@ -37,12 +46,9 @@ supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "gccarch-x86-64" "gccarch-x86-64-v2" "gccarch-x86-64-v3" ]; sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path; }); - nix.distributedBuilds = true; nixpkgs.config.allowUnsupportedSystem = true; - nix.gc = { - dates = "monthly"; - options = lib.mkForce "--delete-older-than 90d"; - }; + nix.distributedBuilds = true; + nix.gc.automatic = lib.mkForce false; nix.settings = { allowed-uris = [ "github:" @@ -57,6 +63,7 @@ "build-worker-04.nyantec.com".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICOq+5I+nlAN2lJoOtoXrYEDuZ/TMPMa43pIlablYigK"; "integra.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIBwEQiSfaDrUAwgul4mktusBPcIVxI4pLNDh9DPopVU"; "schrodinger.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKo7vZ6lS1wx76YsbAdhOsGcc20YMAW52ep8SZ/FCHDp"; + "[machine.cloud-v.co]:20008".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK6Kri0cjPKEXXDEl2GwfwzPO9wuPZEgJS0M6lKRHCqH"; "localhost".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPNVavo3YHVsrYwXRVISu7kDoknn+5inFGySn4azlB8P"; "[build-worker-kyoumanet.fly.dev]:2201".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDL2M97UBHg9aUfjDUxzmzg1r0ga0m3/stummBVwuEAB"; "[build-worker-kyoumanet.fly.dev]:2202".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOTwVKL0P0chPM2Gz23rbT94844+w1CGJdCaZdzfjThz"; @@ -67,7 +74,11 @@ "[build-worker-kyoumanet.fly.dev]:2207".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL9z95a6Fn/dB+iNigEYpuJdBnBwCkIZYaKHcFbGP+RY"; "[build-worker-kyoumanet.fly.dev]:2208".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAk+FNMhTfAVqk3MfLp4QiG/i5ti53DlpnC0q+sOvU9O"; }; - extraConfig = lib.concatLines (lib.genList (i: '' + extraConfig = '' + Host machine-0008.cloud-v.co + Hostname machine.cloud-v.co + Port 20008 + '' + lib.concatLines (lib.genList (i: '' Host build-worker-0${toString (i + 1)} Hostname build-worker-kyoumanet.fly.dev Port 220${toString (i + 1)}