From f9125971c295b99180b8bfb455cede6ae55bc195 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Fri, 23 Oct 2020 11:11:50 -0400 Subject: feat(gs/system): Only enable remote builders on chupacabra Don't enable whitby+nixbuild as remote builders on every machine (eg not mugwump), only chupacabra Change-Id: I8aa8f20d76da4ec0d8caa64ef04697b7e76cbc03 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2058 Reviewed-by: glittershark Tested-by: BuildkiteCI --- .../glittershark/system/system/modules/common.nix | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'users/glittershark/system/system/modules/common.nix') diff --git a/users/glittershark/system/system/modules/common.nix b/users/glittershark/system/system/modules/common.nix index ee7c8fd5fe..711f686d8d 100644 --- a/users/glittershark/system/system/modules/common.nix +++ b/users/glittershark/system/system/modules/common.nix @@ -69,31 +69,11 @@ with lib; nix = { trustedUsers = [ "grfn" ]; autoOptimiseStore = true; - - 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" ]; - }]; - distributedBuilds = true; gc = { automatic = true; - dates = "weekly"; + dates = mkDefault "weekly"; options = "--delete-older-than 30d"; }; }; -- cgit 1.4.1