From 9538bf50aebdfb235932568f2e7b385e4571fef2 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 18 Jun 2020 16:32:43 +0200
Subject: [PATCH] nixos/buildbot-master: support reporters, migrate away from
status
Since Buildbot 0.9.0, status targets were deprecated and ignored.
There's a very small line on startup explaining that, and status simply
isn't reported. Avoid others the same headaches, and do it right in the
NixOS module.
As there might have been changes in the way reporters are organized, and
configuration might need to be migrated remove the old option, and not
just provide an alias.
---
.../continuous-integration/buildbot/master.nix | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix
index 0185f490b0c2..e1950b91382b 100644
--- a/nixos/modules/services/continuous-integration/buildbot/master.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/master.nix
@@ -25,7 +25,7 @@ let
change_source = [ ${concatStringsSep "," cfg.changeSource} ],
schedulers = [ ${concatStringsSep "," cfg.schedulers} ],
builders = [ ${concatStringsSep "," cfg.builders} ],
- status = [ ${concatStringsSep "," cfg.status} ],
+ services = [ ${concatStringsSep "," cfg.reporters} ],
)
for step in [ ${concatStringsSep "," cfg.factorySteps} ]:
factory.addStep(step)
@@ -119,10 +119,10 @@ in {
default = [ "worker.Worker('example-worker', 'pass')" ];
};
- status = mkOption {
+ reporters = mkOption {
default = [];
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 {
@@ -276,6 +276,10 @@ in {
imports = [
(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 ];