mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(gs/system): Only enable remote builders on chupacabra

Browse source 
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 <grfn@gws.fyi>
Tested-by: BuildkiteCI
This commit is contained in:
Griffin Smith 2020-10-23 11:11:50 -04:00 committed by glittershark
parent f13e88ab07
commit f9125971c2
2 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
users/glittershark/system/system/machines/chupacabra.nix
View file

@ -19,6 +19,7 @@
powerManagement = {
enable = true;
powertop.enable = true;
cpuFreqGovernor = "powersave";
};
laptop.onLowBattery = {
@ -87,8 +88,6 @@
[ { device = "/dev/disk/by-uuid/caa7e2ff-475b-4024-b29e-4f88f733fc4c"; }
];
nix.maxJobs = lib.mkDefault 12;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
# High-DPI console
console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
@ -115,6 +114,27 @@
# Necessary to get steam working
hardware.opengl.driSupport32Bit = true;
nix.binaryCaches = [ "ssh://grfn@172.16.0.5" ];
nix.trustedBinaryCaches = [ "ssh://grfn@172.16.0.5" ];
nix = {
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" ];
}];
};
}

22
users/glittershark/system/system/modules/common.nix
View file

@ -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";
};
};