summaryrefslogtreecommitdiffstats
path: root/shared
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-11-11 01:34:18 +0100
committermakefu <github@syntax-fehler.de>2016-11-11 01:34:18 +0100
commit6c092cd20ca256b1cefa92aa779380cdb71c1313 (patch)
tree6bbc5631239a6ad65e790e499563bb1d65ffafc4 /shared
parent8161fcfe3a558b12fb2cf5dec135d26eadacd767 (diff)
buildbot: 0.8.4 -> 0.9.0rc2
Diffstat (limited to 'shared')
-rw-r--r--shared/2configs/shared-buildbot.nix23
1 files changed, 11 insertions, 12 deletions
diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix
index 22144e9ec..dbf79e177 100644
--- a/shared/2configs/shared-buildbot.nix
+++ b/shared/2configs/shared-buildbot.nix
@@ -11,14 +11,13 @@
# /nix/store should be cleaned up automatically as well
nix.gc.automatic = true;
nix.gc.dates = "05:23";
-
networking.firewall.allowedTCPPorts = [ 8010 9989 ];
krebs.buildbot.master = let
stockholm-mirror-url = http://cgit.wolf/stockholm-mirror ;
in {
secrets = [ "retiolum-ci.rsa_key.priv" "cac.json" ];
- slaves = {
- testslave = "krebspass";
+ workers = {
+ testworker = "krebspass";
};
change_source.stockholm = ''
stockholm_repo = '${stockholm-mirror-url}'
@@ -109,7 +108,7 @@
system={}".format(i)])
bu.append(util.BuilderConfig(name="fast-tests",
- slavenames=slavenames,
+ workernames=workernames,
factory=f))
'';
@@ -130,25 +129,25 @@
system={}".format(i)])
bu.append(util.BuilderConfig(name="build-local",
- slavenames=slavenames,
+ workernames=workernames,
factory=f))
'';
# slow-tests = ''
# s = util.BuildFactory()
# s.addStep(grab_repo)
#
-# # slave needs 2 files:
+# # worker needs 2 files:
# # * cac.json
# # * retiolum
-# 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"))
+# s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/cac.json", workerdest="cac.json"))
+# s.addStep(steps.FileDownload(mastersrc="${config.krebs.buildbot.master.workDir}/retiolum-ci.rsa_key.priv", workerdest="retiolum.rsa_key.priv"))
# addShell(s, name="infest-cac-centos7",env=env,
# sigtermTime=60, # SIGTERM 1 minute before SIGKILL
# timeout=10800, # 3h
# command=nixshell + ["infest-cac-centos7"])
#
# bu.append(util.BuilderConfig(name="full-tests",
-# slavenames=slavenames,
+# workernames=workernames,
# factory=s))
# '';
};
@@ -160,15 +159,15 @@
enable = true;
nick = "wolfbot";
server = "cd.retiolum";
- channels = [ "retiolum" ];
+ channels = [ { channel = "retiolum"; } ];
allowForce = true;
};
};
- krebs.buildbot.slave = {
+ krebs.buildbot.worker = {
enable = true;
masterhost = "localhost";
- username = "testslave";
+ username = "testworker";
password = "krebspass";
packages = with pkgs; [ gnumake jq nix populate ];
# all nix commands will need a working nixpkgs installation