diff options
| author | lassulus <lass@aidsballs.de> | 2015-12-30 01:43:51 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-12-30 01:43:51 +0100 |
| commit | 92c4fee6dc10499a9960750abe91c8a4b41eb5d5 (patch) | |
| tree | 1b5c00fd743d226545487126ba9eb149db9b18ad /shared/2configs | |
| parent | 2a0cd63387049350f6de73f609a32a0bf4e49253 (diff) | |
| parent | d574c0ef78f7572aec88e484d3ff6256247e878c (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'shared/2configs')
| -rw-r--r-- | shared/2configs/buildbot-standalone.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/shared/2configs/buildbot-standalone.nix b/shared/2configs/buildbot-standalone.nix index 51c600329..28d1eef2e 100644 --- a/shared/2configs/buildbot-standalone.nix +++ b/shared/2configs/buildbot-standalone.nix @@ -8,6 +8,9 @@ in { }; networking.firewall.allowedTCPPorts = [ 8010 9989 ]; krebs.buildbot.master = { + secrets = [ + "cac.json" + ]; slaves = { testslave = "krebspass"; omo = "krebspass"; @@ -93,9 +96,8 @@ in { # slave needs 2 files: # * cac.json # * retiolum - for file in ["cac.json", "retiolum.rsa_key.priv"]: - s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/{}".format(file), - slavedest=file)) + s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/cac.json", slavedest="cac.json")) + s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/retiolum-ci.rsa_key.priv", slavedest="retiolum.rsa_key.priv")) addShell(s, name="infest-cac-centos7",env=env, sigtermTime=60, # SIGTERM 1 minute before SIGKILL |