summaryrefslogtreecommitdiffstats
path: root/krebs/2configs/shared-buildbot.nix
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-07-23 21:54:11 +0200
committerlassulus <lassulus@lassul.us>2017-07-23 22:50:28 +0200
commit8580a5a53fd8eb356c0e55eabe9f568e985dbfa9 (patch)
treeba510174eb1f054e33b32deb933d220c4b434dd0 /krebs/2configs/shared-buildbot.nix
parent6841ba4855cb6743f3591ec0f381d70ca9998eb2 (diff)
Revert "buildbot: 0.8.4 -> 0.9.0rc2"
This reverts commit 6c092cd20ca256b1cefa92aa779380cdb71c1313.
Diffstat (limited to 'krebs/2configs/shared-buildbot.nix')
-rw-r--r--krebs/2configs/shared-buildbot.nix23
1 files changed, 12 insertions, 11 deletions
diff --git a/krebs/2configs/shared-buildbot.nix b/krebs/2configs/shared-buildbot.nix
index a9e5afc75..b534f0b62 100644
--- a/krebs/2configs/shared-buildbot.nix
+++ b/krebs/2configs/shared-buildbot.nix
@@ -26,11 +26,12 @@ in {
nix.gc.automatic = true;
nix.gc.dates = "05:23";
networking.firewall.allowedTCPPorts = [ 80 8010 9989 ];
+
krebs.buildbot.master = let
stockholm-mirror-url = "http://cgit.${hostname}.r/stockholm" ;
in {
- workers = {
- testworker = "krebspass";
+ slaves = {
+ testslave = "krebspass";
};
change_source.stockholm = ''
stockholm_repo = '${stockholm-mirror-url}'
@@ -119,7 +120,7 @@ in {
system={}".format(i)])
bu.append(util.BuilderConfig(name="fast-tests",
- workernames=workernames,
+ slavenames=slavenames,
factory=f))
'';
@@ -131,25 +132,25 @@ in {
bu.append(util.BuilderConfig(name="build-local",
- workernames=workernames,
+ slavenames=slavenames,
factory=f))
'';
# slow-tests = ''
# s = util.BuildFactory()
# s.addStep(grab_repo)
#
-# # worker needs 2 files:
+# # slave needs 2 files:
# # * cac.json
# # * retiolum
-# 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"))
+# 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
# timeout=10800, # 3h
# command=nixshell + ["infest-cac-centos7"])
#
# bu.append(util.BuilderConfig(name="full-tests",
-# workernames=workernames,
+# slavenames=slavenames,
# factory=s))
# '';
};
@@ -161,7 +162,7 @@ in {
enable = true;
nick = "${hostname}bot";
server = "ni.r";
- channels = [ { channel = "retiolum"; } ];
+ channels = [ "retiolum" ];
allowForce = true;
};
extraConfig = ''
@@ -169,10 +170,10 @@ in {
'';
};
- krebs.buildbot.worker = {
+ krebs.buildbot.slave = {
enable = true;
masterhost = "localhost";
- username = "testworker";
+ username = "testslave";
password = "krebspass";
packages = with pkgs; [ gnumake jq nix populate ];
# all nix commands will need a working nixpkgs installation