From 3b5f868a5bfefd80a09345f169f0fa963eca0293 Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Fri, 14 Sep 2018 11:41:12 +0200
Subject: ci: set env for test-runners

---
 krebs/3modules/ci.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix
index fdc8b9dc4..817539645 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?
                     )])
-- 
cgit v1.2.3


From 0b3497384e7e67e734f5f771fcb5aa649ad964d2 Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Fri, 14 Sep 2018 13:57:58 +0200
Subject: ci: ignore stderr from getJobs

---
 krebs/3modules/ci.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix
index 817539645..16c6d4315 100644
--- a/krebs/3modules/ci.nix
+++ b/krebs/3modules/ci.nix
@@ -128,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
 
-- 
cgit v1.2.3