public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91043 from flokli/buildbot-reporters

Browse Source 
nixos/buildbot-master: support reporters, migrate away from status
This commit is contained in:
Florian Klink 2020-06-18 23:00:44 +02:00 committed by GitHub
commit e051dab9ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/services/continuous-integration/buildbot/master.nix
View File

@ -25,7 +25,7 @@ let
change_source = [ ${concatStringsSep "," cfg.changeSource} ], change_source = [ ${concatStringsSep "," cfg.changeSource} ],
schedulers = [ ${concatStringsSep "," cfg.schedulers} ], schedulers = [ ${concatStringsSep "," cfg.schedulers} ],
builders = [ ${concatStringsSep "," cfg.builders} ], builders = [ ${concatStringsSep "," cfg.builders} ],
status = [ ${concatStringsSep "," cfg.status} ], services = [ ${concatStringsSep "," cfg.reporters} ],
) )
for step in [ ${concatStringsSep "," cfg.factorySteps} ]: for step in [ ${concatStringsSep "," cfg.factorySteps} ]:
factory.addStep(step) factory.addStep(step)
@ -119,10 +119,10 @@ in {
default = [ "worker.Worker('example-worker', 'pass')" ]; default = [ "worker.Worker('example-worker', 'pass')" ];
}; };
status = mkOption { reporters = mkOption {
default = []; default = [];
type = types.listOf types.str; type = types.listOf types.str;
description = "List of status notification endpoints."; description = "List of reporter objects used to present build status to various users.";
}; };
user = mkOption { user = mkOption {
@ -276,6 +276,10 @@ in {
imports = [ imports = [
(mkRenamedOptionModule [ "services" "buildbot-master" "bpPort" ] [ "services" "buildbot-master" "pbPort" ]) (mkRenamedOptionModule [ "services" "buildbot-master" "bpPort" ] [ "services" "buildbot-master" "pbPort" ])
(mkRemovedOptionModule [ "services" "buildbot-master" "status" ] ''
Since Buildbot 0.9.0, status targets are deprecated and ignored.
Review your configuration and migrate to reporters (available at services.buildbot-master.reporters).
'')
]; ];
meta.maintainers = with lib.maintainers; [ nand0p mic92 ]; meta.maintainers = with lib.maintainers; [ nand0p mic92 ];