diff options
| author | makefu <github@syntax-fehler.de> | 2015-12-23 16:20:27 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-12-23 16:20:27 +0100 |
| commit | 1ef9af2c9a49490a2dda21884ad761675c520d1a (patch) | |
| tree | 1d37c9a459b35b6c7b011af0247293c94e4aca6b /krebs/3modules/buildbot | |
| parent | 9a386718714d70f7100b5de297dfd0869d98e47b (diff) | |
k 3 buildbot/master: send sigterm before sigkill for cleanup
Diffstat (limited to 'krebs/3modules/buildbot')
| -rw-r--r-- | krebs/3modules/buildbot/master.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix index 483ba18e7..6ce708769 100644 --- a/krebs/3modules/buildbot/master.nix +++ b/krebs/3modules/buildbot/master.nix @@ -95,8 +95,10 @@ let s.addStep(steps.FileDownload(mastersrc="${cfg.workDir}/{}".format(file), slavedest=file)) - addShell(s,name="infest-cac-centos7",env={"LOGNAME": "shared"}, - command=nixshell + ["infest-cac-centos7"]) + addShell(s, name="infest-cac-centos7",env={"LOGNAME": "shared"}, + sigtermTime=60, # SIGTERM 1 minute before SIGKILL + timeout=5400, # 1.5h timeout + command=nixshell + ["infest-cac-centos7"]) c['builders'].append( util.BuilderConfig(name="full-tests", |