ops/nix-builder-autoscaler
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updating opts

Browse source
This commit is contained in:
Abel Luck 2026-02-27 15:11:48 +01:00
parent 20338484cc
commit 48ff711f39
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

32
nix/modules/nixos/services/buildbot-nix-autoscaler.nix
View file

@ -33,7 +33,7 @@ in
reserveTimeoutSeconds = lib.mkOption { reserveTimeoutSeconds = lib.mkOption {
type = lib.types.int; type = lib.types.int;
default = 1200; default = 600;
description = "Seconds CapacityGateStep waits for a ready reservation."; description = "Seconds CapacityGateStep waits for a ready reservation.";
}; };
@ -133,22 +133,20 @@ in
} }
]; ];
services.buildbot-master.pythonPackages = services.buildbot-master.pythonPackages = ps: [
ps: (
[ if cfg.extensionPackage != null then
( ps.toPythonModule cfg.extensionPackage
if cfg.extensionPackage != null then else if builtins.hasAttr "buildbot-autoscale-ext" ps then
ps.toPythonModule cfg.extensionPackage ps."buildbot-autoscale-ext"
else if builtins.hasAttr "buildbot-autoscale-ext" ps then else
ps."buildbot-autoscale-ext" throw ''
else services.buildbot-nix.nix-build-autoscaler requires buildbot-autoscale-ext in
throw '' services.buildbot-master.pythonPackages set. Add a pythonPackagesExtensions overlay
services.buildbot-nix.nix-build-autoscaler requires buildbot-autoscale-ext in providing buildbot-autoscale-ext, or set extensionPackage explicitly.
services.buildbot-master.pythonPackages set. Add a pythonPackagesExtensions overlay ''
providing buildbot-autoscale-ext, or set extensionPackage explicitly. )
'' ];
)
];
services.buildbot-master.extraImports = '' services.buildbot-master.extraImports = ''
from buildbot_autoscale_ext.configurator import AutoscaleConfigurator from buildbot_autoscale_ext.configurator import AutoscaleConfigurator

2
nix/modules/nixos/services/nix-builder-autoscaler.nix
View file

@ -228,6 +228,8 @@ in
} }
]; ];
environment.systemPackages = [ cfg.package ];
services.haproxy = lib.mkIf cfg.haproxy.generateConfig { services.haproxy = lib.mkIf cfg.haproxy.generateConfig {
enable = true; enable = true;
config = '' config = ''