From 52017e173e4b037f7d31fa140e336d5e70a83d99 Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Sat, 8 Sep 2018 23:20:09 +0200
Subject: buildbot-stockholm: add more changesources

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

(limited to 'krebs/2configs/buildbot-stockholm.nix')

diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix
index 13d4c672..8537ce40 100644
--- a/krebs/2configs/buildbot-stockholm.nix
+++ b/krebs/2configs/buildbot-stockholm.nix
@@ -4,6 +4,14 @@ let
 
   hostname = config.networking.hostName;
 
+  sourceRepos = [
+    "http://cgit.enklave.r/stockholm"
+    "http://cgit.gum.r/stockholm"
+    "http://cgit.hotdog.r/stockholm"
+    "http://cgit.ni.r/stockholm"
+    "http://cgit.prism.r/stockholm"
+  ];
+
   build = pkgs.writeDash "build" ''
     set -eu
     export USER="$1"
@@ -31,17 +39,16 @@ in
     slaves = {
       testslave = "lasspass";
     };
-    change_source.stockholm = ''
-      stockholm_repo = 'http://cgit.hotdog.r/stockholm'
+    change_source.stockholm = concatMapStrings (repo: ''
       cs.append(
           changes.GitPoller(
-              stockholm_repo,
-              workdir='stockholm-poller', branches=True,
+              "${repo}",
+              workdir='stockholm${elemAt(splitString "." repo) 1}', branches=True,
               project='stockholm',
               pollinterval=10
           )
       )
-    '';
+    '') sourceRepos;
     scheduler = {
       auto-scheduler = ''
         sched.append(
@@ -69,7 +76,7 @@ in
     builder_pre = ''
       # prepare grab_repo step for stockholm
       grab_repo = steps.Git(
-          repourl=stockholm_repo,
+          repourl=util.Property('repository', 'http://cgit.hotdog.r/stockholm'),
           mode='full',
           submodules=True,
       )
-- 
cgit v1.2.3


From b7d5dbd74be88e0d26dce173b523bf5019de548b Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Sun, 9 Sep 2018 00:55:57 +0200
Subject: buildbot-stockholm: add more packages to slave

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

(limited to 'krebs/2configs/buildbot-stockholm.nix')

diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix
index 8537ce40..6555b73f 100644
--- a/krebs/2configs/buildbot-stockholm.nix
+++ b/krebs/2configs/buildbot-stockholm.nix
@@ -183,6 +183,6 @@ in
     masterhost = "localhost";
     username = "testslave";
     password = "lasspass";
-    packages = with pkgs; [ gnumake jq nix populate ];
+    packages = with pkgs; [ gnumake jq nix populate gnutar lzma gzip ];
   };
 }
-- 
cgit v1.2.3


From d3c84b0d2981f46574046e19d8e3d618065b92a0 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 9 Sep 2018 10:04:13 +0200
Subject: buildbot-stockholm: build quietly and show trace

---
 krebs/2configs/buildbot-stockholm.nix | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'krebs/2configs/buildbot-stockholm.nix')

diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix
index 6555b73f..add27f39 100644
--- a/krebs/2configs/buildbot-stockholm.nix
+++ b/krebs/2configs/buildbot-stockholm.nix
@@ -12,11 +12,26 @@ let
     "http://cgit.prism.r/stockholm"
   ];
 
+  # usage: build USER HOST
+  # This executable is meant to be run with <stockholm> as working directory.
+  # USER is expected to be a subdirectory of the working directory.
   build = pkgs.writeDash "build" ''
-    set -eu
-    export USER="$1"
-    export SYSTEM="$2"
-    $(nix-build $USER/krops.nix --no-out-link --argstr name "$SYSTEM" --argstr target "$HOME/stockholm-build" -A ci)
+    set -efu
+
+    user=$1
+    host=$2
+
+    result=$(nix-build \
+        --argstr name "$host" \
+        --argstr target "$HOME"/stockholm-build \
+        --attr ci \
+        --no-build-output \
+        --no-out-link \
+        --show-trace \
+        "$user"/krops.nix \
+    )
+
+    exec "$result"
   '';
 
 
-- 
cgit v1.2.3


From df809dca51b2a4037449d626e14a75aa91be7b3a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 9 Sep 2018 10:23:20 +0200
Subject: buildbot-stockholm: build using the test attribute

While at it, fix */krops.nix to actually use the target attribute.
---
 krebs/2configs/buildbot-stockholm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/2configs/buildbot-stockholm.nix')

diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix
index add27f39..0aa9288e 100644
--- a/krebs/2configs/buildbot-stockholm.nix
+++ b/krebs/2configs/buildbot-stockholm.nix
@@ -24,7 +24,7 @@ let
     result=$(nix-build \
         --argstr name "$host" \
         --argstr target "$HOME"/stockholm-build \
-        --attr ci \
+        --attr test \
         --no-build-output \
         --no-out-link \
         --show-trace \
-- 
cgit v1.2.3