modules/nixos/buildbot: use template for workersFile, set WORKER_COUNT explictly
This commit is contained in:
parent
d761d4ce23
commit
1c697b432a
1 changed files with 13 additions and 3 deletions
|
@ -10,6 +10,8 @@ let
|
||||||
]
|
]
|
||||||
++ config.nix.settings.extra-platforms
|
++ config.nix.settings.extra-platforms
|
||||||
++ builtins.concatLists (map (host: host.systems) config.nix.buildMachines);
|
++ builtins.concatLists (map (host: host.systems) config.nix.buildMachines);
|
||||||
|
|
||||||
|
WORKER_COUNT = toString config.nix.settings.max-jobs;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
@ -22,9 +24,17 @@ in
|
||||||
sops.secrets.buildbot-github-oauth-secret = { };
|
sops.secrets.buildbot-github-oauth-secret = { };
|
||||||
sops.secrets.buildbot-github-app-secret-key = { };
|
sops.secrets.buildbot-github-app-secret-key = { };
|
||||||
sops.secrets.buildbot-github-webhook-secret = { };
|
sops.secrets.buildbot-github-webhook-secret = { };
|
||||||
sops.secrets.buildbot-nix-workers = { };
|
sops.secrets.buildbot-nix-worker-password = { };
|
||||||
sops.secrets.cachix-auth-token = { };
|
sops.secrets.cachix-auth-token = { };
|
||||||
|
|
||||||
|
sops.templates.buildbot-nix-workers.content = ''
|
||||||
|
[{
|
||||||
|
"name": "${config.networking.hostName}",
|
||||||
|
"pass": "${config.sops.placeholder.buildbot-nix-worker-password}",
|
||||||
|
"cores": ${WORKER_COUNT}
|
||||||
|
}]
|
||||||
|
'';
|
||||||
|
|
||||||
services.buildbot-nix.master = {
|
services.buildbot-nix.master = {
|
||||||
enable = true;
|
enable = true;
|
||||||
admins = [
|
admins = [
|
||||||
|
@ -39,7 +49,7 @@ in
|
||||||
evalMaxMemorySize = 4096;
|
evalMaxMemorySize = 4096;
|
||||||
evalWorkerCount = 32;
|
evalWorkerCount = 32;
|
||||||
jobReportLimit = 0;
|
jobReportLimit = 0;
|
||||||
workersFile = config.sops.secrets.buildbot-nix-workers.path;
|
workersFile = config.sops.templates.buildbot-nix-workers.path;
|
||||||
cachix = {
|
cachix = {
|
||||||
enable = true;
|
enable = true;
|
||||||
name = "nix-community";
|
name = "nix-community";
|
||||||
|
@ -62,7 +72,7 @@ in
|
||||||
titleUrl = "https://nix-community.org/";
|
titleUrl = "https://nix-community.org/";
|
||||||
};
|
};
|
||||||
|
|
||||||
sops.secrets.buildbot-nix-worker-password = { };
|
systemd.services.buildbot-worker.environment = { inherit WORKER_COUNT; };
|
||||||
|
|
||||||
services.buildbot-nix.worker = {
|
services.buildbot-nix.worker = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
Loading…
Add table
Reference in a new issue