summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-11-21 19:39:50 +0100
committerlassulus <lass@aidsballs.de>2016-11-21 19:40:54 +0100
commite06ac2aa3e526d2fddcba9d336a503a6d42c5392 (patch)
tree9cc0eb184619efa92b2a198c9f18b09b4dc5ecd3 /lass
parent55ffcfcb1a327f6e7465f43e4539ea5192242e57 (diff)
l 2 buildbot: update config to work with 0.9.1
Diffstat (limited to 'lass')
-rw-r--r--lass/2configs/buildbot-standalone.nix20
1 files changed, 10 insertions, 10 deletions
diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix
index cf3354fd7..7422abdc8 100644
--- a/lass/2configs/buildbot-standalone.nix
+++ b/lass/2configs/buildbot-standalone.nix
@@ -13,8 +13,8 @@ in {
config.krebs.buildbot.master = let
stockholm-mirror-url = http://cgit.prism/stockholm ;
in {
- slaves = {
- testslave = "lasspass";
+ workers = {
+ testworker = "lasspass";
};
change_source.stockholm = ''
stockholm_repo = '${stockholm-mirror-url}'
@@ -36,7 +36,7 @@ in {
};
builder_pre = ''
# prepare grab_repo step for stockholm
- grab_repo = steps.Git(repourl=stockholm_repo, mode='incremental')
+ grab_repo = steps.Git(repourl=stockholm_repo, mode='incremental', alwaysUseLatest=True)
# TODO: get nixpkgs/stockholm paths from krebs
env_lass = {
@@ -94,7 +94,7 @@ in {
system={}".format(i)])
bu.append(util.BuilderConfig(name="build-all",
- slavenames=slavenames,
+ workernames=workernames,
factory=f))
'';
@@ -152,7 +152,7 @@ in {
make system=prism pkgs.{}".format(i)])
bu.append(util.BuilderConfig(name="build-pkgs",
- slavenames=slavenames,
+ workernames=workernames,
factory=f))
'';
};
@@ -162,15 +162,15 @@ in {
enable = true;
nick = "buildbot-lass";
server = "ni.r";
- channels = [ { channels = "retiolum"; } ];
+ channels = [ { channel = "retiolum"; } ];
allowForce = true;
};
};
- config.krebs.buildbot.slave = {
+ config.krebs.buildbot.worker = {
enable = true;
masterhost = "localhost";
- username = "testslave";
+ username = "testworker";
password = "lasspass";
packages = with pkgs; [ gnumake jq nix populate ];
extraEnviron = {
@@ -190,8 +190,8 @@ in {
options.lass.build-ssh-privkey = mkOption {
type = types.secret-file;
default = {
- path = "${config.users.users.buildbotSlave.home}/ssh.privkey";
- owner = { inherit (config.users.users.buildbotSlave ) name uid;};
+ path = "${config.users.users.buildbotworker.home}/ssh.privkey";
+ owner = { inherit (config.users.users.buildbotworker ) name uid;};
source-path = toString <secrets> + "/build.ssh.key";
};
};