Merge remote-tracking branch 'lass/master'

1 files changed, 10 insertions, 8 deletions

diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix
index 62a5f9ab5..13d4c6729 100644
--- a/krebs/2configs/buildbot-stockholm.nix
+++ b/krebs/2configs/buildbot-stockholm.nix
@@ -4,6 +4,14 @@ let
 
   hostname = config.networking.hostName;
 
+  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)
+  '';
+
+
 in
 {
   networking.firewall.allowedTCPPorts = [ 80 ];
@@ -24,7 +32,7 @@ in
       testslave = "lasspass";
     };
     change_source.stockholm = ''
-      stockholm_repo = 'http://cgit.prism.r/stockholm'
+      stockholm_repo = 'http://cgit.hotdog.r/stockholm'
       cs.append(
           changes.GitPoller(
               stockholm_repo,
@@ -95,15 +103,9 @@ in
                         env={
                           "NIX_PATH": "secrets=/var/src/stockholm/null:stockholm=./:/var/src",
                           "NIX_REMOTE": "daemon",
-                          "dummy_secrets": "true",
                         },
                         command=[
-                          "nix-shell", "-I", "stockholm=.", "--run", " ".join(["test",
-                            "--user={}".format(user),
-                            "--system={}".format(host),
-                            "--force-populate",
-                            "--target=$LOGNAME@${config.krebs.build.host.name}$HOME/{}".format(user),
-                          ])
+                          "${build}", user, host
                         ],
                         timeout=90001,
                         workdir='build', # TODO figure out why we need this?