summaryrefslogtreecommitdiffstats
path: root/krebs/3modules/buildbot
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-09-26 11:11:06 +0200
committermakefu <github@syntax-fehler.de>2018-09-26 11:11:06 +0200
commitd7ecf1abdcc52e82af8ea17e4fc8d4be8fc41822 (patch)
treead4da7b3071dd6b2c5990a3de3cd380d5052767d /krebs/3modules/buildbot
parent7a0d3121be1ae433a612ad77e9bb693a66aed41c (diff)
parenta374a452112ba962ab90e45b6b0f27b3a1330e4f (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/3modules/buildbot')
-rw-r--r--krebs/3modules/buildbot/master.nix1
-rw-r--r--krebs/3modules/buildbot/slave.nix2
2 files changed, 1 insertions, 2 deletions
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix
index a02f3645..209dbe98 100644
--- a/krebs/3modules/buildbot/master.nix
+++ b/krebs/3modules/buildbot/master.nix
@@ -82,6 +82,7 @@ let
irc = words.IRC("${cfg.irc.server}", "${cfg.irc.nick}",
channels=${builtins.toJSON cfg.irc.channels},
notify_events={
+ 'started': 1,
'success': 1,
'failure': 1,
'exception': 1,
diff --git a/krebs/3modules/buildbot/slave.nix b/krebs/3modules/buildbot/slave.nix
index fba58544..544f9c4e 100644
--- a/krebs/3modules/buildbot/slave.nix
+++ b/krebs/3modules/buildbot/slave.nix
@@ -160,8 +160,6 @@ let
# TODO: maybe also prepare buildbot.tac?
ExecStartPre = pkgs.writeDash "buildbot-master-init" ''
set -efux
- #remove garbage from old versions
- rm -rf ${workdir}
mkdir -p ${workdir}/info
cp ${buildbot-slave-init} ${workdir}/buildbot.tac
echo ${contact} > ${workdir}/info/admin