diff options
| author | tv <tv@krebsco.de> | 2018-09-16 02:11:05 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2018-09-16 02:11:05 +0200 |
| commit | 45c39cddad6d8d2d65b3a145648611c1e9c78737 (patch) | |
| tree | 66f5ed7d2f09bf422b0e3128fadf449da428858e /krebs | |
| parent | 5487d466d0d9b596b054c545b499aecbbe56b5aa (diff) | |
| parent | 0b3497384e7e67e734f5f771fcb5aa649ad964d2 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/2configs/buildbot-stockholm.nix | 12 | ||||
| -rw-r--r-- | krebs/3modules/ci.nix | 17 |
2 files changed, 24 insertions, 5 deletions
diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix index 0ee91ae34..d10fb7203 100644 --- a/krebs/2configs/buildbot-stockholm.nix +++ b/krebs/2configs/buildbot-stockholm.nix @@ -16,6 +16,18 @@ krebs.ci = { enable = true; repos = { + disko.urls = [ + "http://cgit.gum.r/disko" + "http://cgit.hotdog.r/disko" + "http://cgit.ni.r/disko" + "http://cgit.prism.r/disko" + ]; + nix_writers.urls = [ + "http://cgit.hotdog.r/nix-writers" + "http://cgit.ni.r/nix-writers" + "http://cgit.prism.r/nix-writers" + "https://git.ingolf-wagner.de/krebs/nix-writers.git" + ]; stockholm.urls = [ "http://cgit.enklave.r/stockholm" "http://cgit.gum.r/stockholm" diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix index 33afb2c0a..16c6d4315 100644 --- a/krebs/3modules/ci.nix +++ b/krebs/3modules/ci.nix @@ -26,8 +26,8 @@ let hostname = config.networking.hostName; getJobs = pkgs.writeDash "get_jobs" '' - nix-build --no-out-link ./ci.nix 2>&1 > /dev/null - nix-instantiate --eval --strict --json ./ci.nix + nix-build --no-out-link --quiet -Q ./ci.nix > /dev/null + nix-instantiate --quiet -Q --eval --strict --json ./ci.nix ''; imp = { @@ -53,9 +53,12 @@ let nameValuePair name '' sched.append( schedulers.SingleBranchScheduler( - change_filter=util.ChangeFilter(branch_re=".*"), + change_filter=util.ChangeFilter( + branch_re=".*", + project='${name}', + ), treeStableTimer=60, - name="build-all-branches", + name="${name}-all-branches", builderNames=[ "${name}", ] @@ -97,6 +100,10 @@ let command=[ new_steps[new_step] ], + env={ + "NIX_REMOTE": "daemon", + "NIX_PATH": "secrets=/var/src/stockholm/null:/var/src", + }, timeout=90001, workdir='build', # TODO figure out why we need this? )]) @@ -121,7 +128,7 @@ let }, name="get_steps", command=["${getJobs}"], - property="steps_json" + extract_fn=lambda rc, stdout, stderr: { 'steps_json': stdout }, )) f_${name}.addStep(StepToStartMoreSteps(command=["echo"])) # TODO remove dummy command from here |