summaryrefslogtreecommitdiffstats
path: root/krebs/3modules
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-09-17 01:14:03 +0200
committermakefu <github@syntax-fehler.de>2018-09-17 01:14:03 +0200
commit12a3936e06b3fc6cb3b61fd10c7aeb8d3f461f63 (patch)
tree7ad0d614aa4290878a1c265e22a4c6f3d964de73 /krebs/3modules
parent0823d0cbdc2861defaabc232058d96c8862c0b24 (diff)
parentfca8903d5bea7be12f3f1f46b3cd2f5b9803e30c (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/3modules')
-rw-r--r--krebs/3modules/ci.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix
index fdc8b9dc4..16c6d4315 100644
--- a/krebs/3modules/ci.nix
+++ b/krebs/3modules/ci.nix
@@ -100,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?
)])
@@ -124,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