From f2c8723bb8ad12abb6b9ec6d562acf7d64cc5fff Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Thu, 13 Sep 2018 14:41:26 +0200
Subject: ci: silence nix-build/nix-instantiate

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

(limited to 'krebs')

diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix
index 33afb2c0..37aef74e 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 = {
-- 
cgit v1.2.3


From 244d31c7611e26e9cac91af2e945910b38acee96 Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Thu, 13 Sep 2018 14:41:58 +0200
Subject: ci: split schedulers by repo

---
 krebs/3modules/ci.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'krebs')

diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix
index 37aef74e..fdc8b9dc 100644
--- a/krebs/3modules/ci.nix
+++ b/krebs/3modules/ci.nix
@@ -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}",
                   ]
-- 
cgit v1.2.3


From 96ea1311d698ec30ab14af0f0169367fc1e6260b Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Fri, 14 Sep 2018 09:57:09 +0200
Subject: buildbot: test nix-writers

---
 krebs/2configs/buildbot-stockholm.nix | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'krebs')

diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix
index 0ee91ae3..8284ff3b 100644
--- a/krebs/2configs/buildbot-stockholm.nix
+++ b/krebs/2configs/buildbot-stockholm.nix
@@ -16,6 +16,12 @@
   krebs.ci = {
     enable = true;
     repos = {
+      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"
-- 
cgit v1.2.3


From da41d8b4738083d5ad2263d5ed657ddb9f941cb4 Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Fri, 14 Sep 2018 11:40:48 +0200
Subject: buildbot: test disko

---
 krebs/2configs/buildbot-stockholm.nix | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'krebs')

diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix
index 8284ff3b..d10fb720 100644
--- a/krebs/2configs/buildbot-stockholm.nix
+++ b/krebs/2configs/buildbot-stockholm.nix
@@ -16,6 +16,12 @@
   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"
-- 
cgit v1.2.3


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')

diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix
index fdc8b9dc..81753964 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')

diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix
index 81753964..16c6d431 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