From ed9909527cc13222b2dcd1ad4be4da05ab2600c4 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Tue, 27 Oct 2020 17:26:09 -0400 Subject: refactor(gs/system): Prefer dobharchu over cerberus This machine is significantly faster. Also, drop nixbuild, since the transfer speed is too slow to make it worth it. Change-Id: Ic14ef96e03a81dc429e4b4fec961c891dbb4b2b9 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2066 Reviewed-by: glittershark Tested-by: BuildkiteCI --- .../system/system/machines/chupacabra.nix | 34 ++++++++++------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/users/glittershark/system/system/machines/chupacabra.nix b/users/glittershark/system/system/machines/chupacabra.nix index 4e0f9fff0129..38ec11e97769 100644 --- a/users/glittershark/system/system/machines/chupacabra.nix +++ b/users/glittershark/system/system/machines/chupacabra.nix @@ -118,23 +118,21 @@ maxJobs = lib.mkDefault 12; binaryCaches = [ "ssh://grfn@172.16.0.5" ]; trustedBinaryCaches = [ "ssh://grfn@172.16.0.5" ]; - buildMachines = [{ - hostName = "172.16.0.3"; - sshUser = "griffin"; - sshKey = "/home/grfn/.ssh/id_rsa"; - system = "x86_64-darwin"; - maxJobs = 4; - } { - hostName = "172.16.0.4"; - sshUser = "griffin"; - sshKey = "/home/grfn/.ssh/id_rsa"; - system = "x86_64-darwin"; - maxJobs = 8; # 16 cpus - } { - hostName = "eu.nixbuild.net"; - system = "x86_64-linux"; - maxJobs = 100; - supportedFeatures = [ "benchmark" "big-parallel" ]; - }]; + buildMachines = [ + { + hostName = "172.16.0.4"; + sshUser = "griffin"; + sshKey = "/home/grfn/.ssh/id_rsa"; + system = "x86_64-darwin"; + maxJobs = 8; # 16 cpus + } + { + hostName = "172.16.0.3"; + sshUser = "griffin"; + sshKey = "/home/grfn/.ssh/id_rsa"; + system = "x86_64-darwin"; + maxJobs = 4; + } + ]; }; } -- cgit 1.4.1