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 +-
 krebs/krops.nix                       | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'krebs')

diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix
index add27f395..0aa9288ec 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 \
diff --git a/krebs/krops.nix b/krebs/krops.nix
index c71e60571..5378d6fb0 100644
--- a/krebs/krops.nix
+++ b/krebs/krops.nix
@@ -55,14 +55,9 @@
     target = "root@${name}/var/src";
   };
 
-  # usage: $(nix-build --no-out-link --argstr name HOSTNAME -A test)
-  test = pkgs.krops.writeTest "${name}-test" {
+  # usage: $(nix-build --no-out-link --argstr name HOSTNAME --argstr target PATH -A test)
+  test = { target }: pkgs.krops.writeTest "${name}-test" {
+    inherit target;
     source = source { test = true; };
-    target = "${lib.getEnv "HOME"}/tmp/${name}-krops-test-src";
-  };
-
-  ci = pkgs.krops.writeTest "${name}-test" {
-    source = source { test = true; };
-    target = "${lib.getEnv "HOME"}/stockholm-build";
   };
 }
-- 
cgit v1.2.3