Merge remote-tracking branch 'lass/master'

4 files changed, 43 insertions, 14 deletions

diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix
index 13d4c6729..0aa9288ec 100644
--- a/krebs/2configs/buildbot-stockholm.nix
+++ b/krebs/2configs/buildbot-stockholm.nix
@@ -4,11 +4,34 @@ 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"
+  ];
+
+  # 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 test \
+        --no-build-output \
+        --no-out-link \
+        --show-trace \
+        "$user"/krops.nix \
+    )
+
+    exec "$result"
   '';
 
 
@@ -31,17 +54,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 +91,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,
       )
@@ -176,6 +198,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 ];
   };
 }
diff --git a/krebs/2configs/reaktor-krebs.nix b/krebs/2configs/reaktor-krebs.nix
index 2e63f1385..ba3715161 100644
--- a/krebs/2configs/reaktor-krebs.nix
+++ b/krebs/2configs/reaktor-krebs.nix
@@ -15,6 +15,7 @@ with import <stockholm/lib>;
       sed-plugin
       task-add
       task-delete
+      task-done
       task-list
     ] ++
       (attrValues (todo "agenda"))
diff --git a/krebs/2configs/reaktor-retiolum.nix b/krebs/2configs/reaktor-retiolum.nix
index d5f1851e3..90573ca1c 100644
--- a/krebs/2configs/reaktor-retiolum.nix
+++ b/krebs/2configs/reaktor-retiolum.nix
@@ -12,6 +12,7 @@ with import <stockholm/lib>;
       sed-plugin
       task-add
       task-delete
+      task-done
       task-list
     ] ++
       (attrValues (todo "agenda"))
diff --git a/krebs/2configs/repo-sync.nix b/krebs/2configs/repo-sync.nix
index 813dc154b..392e6bed3 100644
--- a/krebs/2configs/repo-sync.nix
+++ b/krebs/2configs/repo-sync.nix
@@ -20,11 +20,15 @@ let
       cgit.section = section;
       hooks = mkDefault {
         post-receive = pkgs.git-hooks.irc-announce {
-          nick = config.networking.hostName;
-          verbose = false;
           channel = "#xxx";
+          refs = [
+            "refs/heads/master"
+            "refs/heads/newest"
+            "refs/tags/*"
+          ];
+          nick = config.networking.hostName;
           server = "irc.r";
-          branches = [ "master" "newest" ];
+          verbose = false;
         };
       };
     };
@@ -139,6 +143,7 @@ in {
 
     (sync-retiolum { name = "cholerab"; desc = "krebs thesauron & enterprise-patterns"; section = "documentation"; })
 
+    (sync-retiolum { name = "buildbot-classic"; desc = "fork of buildbot"; section = "software"; })
     (sync-retiolum { name = "disko"; desc = "take a description of your disk layout and produce a format script"; section = "software"; })
     (sync-retiolum { name = "news"; desc = "take a rss feed and a timeout and print it to stdout"; section = "software"; })
     (sync-retiolum { name = "krops"; desc = "krebs ops"; section = "software"; })