nix: resolve buildbot extension from buildbot python set
This commit is contained in:
parent
9275d2cc8a
commit
20338484cc
2 changed files with 43 additions and 41 deletions
|
|
@ -1,21 +1,10 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.services.buildbot-nix.nix-build-autoscaler;
|
||||
defaultExtensionPackage =
|
||||
if builtins.hasAttr "buildbot-autoscale-ext" pkgs then
|
||||
pkgs."buildbot-autoscale-ext"
|
||||
else if
|
||||
builtins.hasAttr "python3Packages" pkgs
|
||||
&& builtins.hasAttr "buildbot-autoscale-ext" pkgs.python3Packages
|
||||
then
|
||||
pkgs.python3Packages."buildbot-autoscale-ext"
|
||||
else
|
||||
null;
|
||||
in
|
||||
{
|
||||
options.services.buildbot-nix.nix-build-autoscaler = {
|
||||
|
|
@ -23,8 +12,11 @@ in
|
|||
|
||||
extensionPackage = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.package;
|
||||
default = defaultExtensionPackage;
|
||||
description = "Package providing buildbot_autoscale_ext.";
|
||||
default = null;
|
||||
description = ''
|
||||
Optional explicit package override for buildbot_autoscale_ext.
|
||||
Leave unset to resolve buildbot-autoscale-ext from Buildbot's pythonPackages set.
|
||||
'';
|
||||
};
|
||||
|
||||
daemonSocket = lib.mkOption {
|
||||
|
|
@ -135,20 +127,28 @@ in
|
|||
|
||||
config = lib.mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.extensionPackage != null;
|
||||
message = ''
|
||||
services.buildbot-nix.nix-build-autoscaler.extensionPackage is not set and
|
||||
pkgs.buildbot-autoscale-ext was not found. Configure extensionPackage explicitly.
|
||||
'';
|
||||
}
|
||||
{
|
||||
assertion = cfg.builderClusterHost != null;
|
||||
message = "services.buildbot-nix.nix-build-autoscaler.builderClusterHost must be set.";
|
||||
}
|
||||
];
|
||||
|
||||
services.buildbot-master.pythonPackages = _ps: [ cfg.extensionPackage ];
|
||||
services.buildbot-master.pythonPackages =
|
||||
ps:
|
||||
[
|
||||
(
|
||||
if cfg.extensionPackage != null then
|
||||
ps.toPythonModule cfg.extensionPackage
|
||||
else if builtins.hasAttr "buildbot-autoscale-ext" ps then
|
||||
ps."buildbot-autoscale-ext"
|
||||
else
|
||||
throw ''
|
||||
services.buildbot-nix.nix-build-autoscaler requires buildbot-autoscale-ext in
|
||||
services.buildbot-master.pythonPackages set. Add a pythonPackagesExtensions overlay
|
||||
providing buildbot-autoscale-ext, or set extensionPackage explicitly.
|
||||
''
|
||||
)
|
||||
];
|
||||
|
||||
services.buildbot-master.extraImports = ''
|
||||
from buildbot_autoscale_ext.configurator import AutoscaleConfigurator
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue