sercanto/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modules/nixos: refactor remote workers

Browse source
This commit is contained in:
zowoq 2023-09-24 08:57:55 +10:00
parent 4293c51090
commit d446870b79
7 changed files with 40 additions and 56 deletions

6
flake.nix
View file

@ -148,10 +148,8 @@
hydra = ./modules/nixos/hydra.nix;
monitoring = ./modules/nixos/monitoring;
nur-update = ./modules/nixos/nur-update.nix;
remote-builder = ./modules/nixos/remote-builder/default.nix;
remote-builder-build04 = ./modules/nixos/remote-builder/build04.nix;
remote-builder-darwin02 = ./modules/nixos/remote-builder/darwin02.nix;
remote-builder-darwin03 = ./modules/nixos/remote-builder/darwin03.nix;
remote-builder = ./modules/nixos/remote-builder.nix;
remote-workers = ./modules/nixos/remote-workers.nix;
watch-store = ./modules/nixos/cachix/watch-store.nix;
zfs = ./modules/nixos/zfs.nix;
};

4
hosts/build03/configuration.nix
View file

@ -17,9 +17,7 @@
inputs.self.nixosModules.hercules-ci
inputs.self.nixosModules.watch-store
inputs.self.nixosModules.zfs
inputs.self.nixosModules.remote-builder-build04
inputs.self.nixosModules.remote-builder-darwin02
inputs.self.nixosModules.remote-builder-darwin03
inputs.self.nixosModules.remote-workers
inputs.self.nixosModules.github-org-backup
inputs.self.nixosModules.hydra

2
modules/nixos/remote-builder/default.nix → modules/nixos/remote-builder.nix
View file

@ -1,6 +1,6 @@
{
imports = [
../../shared/remote-builder.nix
../shared/remote-builder.nix
];
users.users.nix = {

16
modules/nixos/remote-builder/build04.nix
View file

@ -1,16 +0,0 @@
{ config, ... }:
{
nix.distributedBuilds = true;
nix.buildMachines = [
{
hostName = "build04.nix-community.org";
maxJobs = 4;
protocol = "ssh"; # this machine is used by hydra which doesn't support ssh-ng
sshKey = config.sops.secrets.id_buildfarm.path;
sshUser = "nix";
system = "aarch64-linux";
supportedFeatures = [ "big-parallel" ];
}
];
sops.secrets.id_buildfarm = { };
}

16
modules/nixos/remote-builder/darwin02.nix
View file

@ -1,16 +0,0 @@
{ config, ... }:
{
nix.distributedBuilds = true;
nix.buildMachines = [
{
hostName = "darwin02.nix-community.org";
maxJobs = 8;
protocol = "ssh"; # this machine is used by hydra which doesn't support ssh-ng
sshKey = config.sops.secrets.id_buildfarm.path;
sshUser = "nix";
systems = [ "aarch64-darwin" "x86_64-darwin" ];
supportedFeatures = [ "big-parallel" ];
}
];
sops.secrets.id_buildfarm = { };
}

16
modules/nixos/remote-builder/darwin03.nix
View file

@ -1,16 +0,0 @@
{ config, ... }:
{
nix.distributedBuilds = true;
nix.buildMachines = [
{
hostName = "darwin03.nix-community.org";
maxJobs = 8;
protocol = "ssh"; # this machine is used by hydra which doesn't support ssh-ng
sshKey = config.sops.secrets.id_buildfarm.path;
sshUser = "nix";
systems = [ "aarch64-darwin" "x86_64-darwin" ];
supportedFeatures = [ "big-parallel" ];
}
];
sops.secrets.id_buildfarm = { };
}

36
modules/nixos/remote-workers.nix Normal file
View file

@ -0,0 +1,36 @@
{ config, ... }:
{
sops.secrets.id_buildfarm = { };
nix.distributedBuilds = true;
nix.buildMachines = [
# these machines are used by hydra which doesn't support ssh-ng
{
hostName = "build04.nix-community.org";
maxJobs = 4;
protocol = "ssh";
sshKey = config.sops.secrets.id_buildfarm.path;
sshUser = "nix";
system = "aarch64-linux";
supportedFeatures = [ "big-parallel" ];
}
{
hostName = "darwin02.nix-community.org";
maxJobs = 8;
protocol = "ssh";
sshKey = config.sops.secrets.id_buildfarm.path;
sshUser = "nix";
systems = [ "aarch64-darwin" "x86_64-darwin" ];
supportedFeatures = [ "big-parallel" ];
}
{
hostName = "darwin03.nix-community.org";
maxJobs = 8;
protocol = "ssh";
sshKey = config.sops.secrets.id_buildfarm.path;
sshUser = "nix";
systems = [ "aarch64-darwin" "x86_64-darwin" ];
supportedFeatures = [ "big-parallel" ];
}
];
}