From 39870dbc4ab8849af41ffdf49bc64d4abea5b4b1 Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Fri, 7 Sep 2018 14:59:01 +0200
Subject: l krops: get target as argument

---
 lass/krops.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'lass/krops.nix')

diff --git a/lass/krops.nix b/lass/krops.nix
index 776a3a55d..ca3914f53 100644
--- a/lass/krops.nix
+++ b/lass/krops.nix
@@ -1,4 +1,4 @@
-{ config ? config, name }: let
+{ config ? config, name, target}: let
   inherit (import ../krebs/krops.nix { inherit name; })
     krebs-source
     lib
@@ -24,19 +24,12 @@ in {
   # usage: $(nix-build --no-out-link --argstr name HOSTNAME -A deploy)
   deploy = pkgs.krops.writeDeploy "${name}-deploy" {
     source = source { test = false; };
-    target = "root@${name}/var/src";
+    inherit target;
   };
 
   # usage: $(nix-build --no-out-link --argstr name HOSTNAME -A test)
-  test = pkgs.krops.writeTest "${name}-test" {
+  ci = pkgs.krops.writeTest "${name}-test" {
     source = source { test = true; };
-    target = "${lib.getEnv "HOME"}/tmp/${name}-krops-test-src";
+    inherit target;
   };
-
-  ci = map (host:
-    pkgs.krops.writeTest "${host.name}-test" {
-      source = source { test = true; };
-      target = "${lib.getEnv "TMPDIR"}/lass/${host.name}";
-    }
-  ) (lib.filter (host: lib.getAttr "ci" host && host.owner == "lass") (lib.attrValues config.krebs.hosts));
 }
-- 
cgit v1.2.3


From c667b2c66407f2daf67c635ca429858fa80c5dab Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Fri, 7 Sep 2018 16:55:37 +0200
Subject: l krops: get dummy-secrets via relative path

---
 lass/krops.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/krops.nix')

diff --git a/lass/krops.nix b/lass/krops.nix
index ca3914f53..c12c0925c 100644
--- a/lass/krops.nix
+++ b/lass/krops.nix
@@ -10,7 +10,7 @@
     {
       nixos-config.symlink = "stockholm/lass/1systems/${name}/physical.nix";
       secrets = if test then {
-        file = "/home/lass/stockholm/lass/2configs/tests/dummy-secrets";
+        file = toString ./2configs/tests/dummy-secrets;
       } else {
         pass = {
           dir = "${lib.getEnv "HOME"}/.password-store";
-- 
cgit v1.2.3


From 293dada1cd44d23249697cb7c86d0a12f34c0e0d Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Fri, 7 Sep 2018 17:35:41 +0200
Subject: Revert "l krops: get target as argument"

This reverts commit 39870dbc4ab8849af41ffdf49bc64d4abea5b4b1.
---
 lass/krops.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'lass/krops.nix')

diff --git a/lass/krops.nix b/lass/krops.nix
index c12c0925c..5111730ed 100644
--- a/lass/krops.nix
+++ b/lass/krops.nix
@@ -1,4 +1,4 @@
-{ config ? config, name, target}: let
+{ config ? config, name }: let
   inherit (import ../krebs/krops.nix { inherit name; })
     krebs-source
     lib
@@ -24,12 +24,19 @@ in {
   # usage: $(nix-build --no-out-link --argstr name HOSTNAME -A deploy)
   deploy = pkgs.krops.writeDeploy "${name}-deploy" {
     source = source { test = false; };
-    inherit target;
+    target = "root@${name}/var/src";
   };
 
   # usage: $(nix-build --no-out-link --argstr name HOSTNAME -A test)
-  ci = pkgs.krops.writeTest "${name}-test" {
+  test = pkgs.krops.writeTest "${name}-test" {
     source = source { test = true; };
-    inherit target;
+    target = "${lib.getEnv "HOME"}/tmp/${name}-krops-test-src";
   };
+
+  ci = map (host:
+    pkgs.krops.writeTest "${host.name}-test" {
+      source = source { test = true; };
+      target = "${lib.getEnv "TMPDIR"}/lass/${host.name}";
+    }
+  ) (lib.filter (host: lib.getAttr "ci" host && host.owner == "lass") (lib.attrValues config.krebs.hosts));
 }
-- 
cgit v1.2.3


From f21ec7612c1151a3a679a67b08a768aac43a9605 Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Fri, 7 Sep 2018 17:40:10 +0200
Subject: l krops: prepare .ci for buildbot

---
 lass/krops.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'lass/krops.nix')

diff --git a/lass/krops.nix b/lass/krops.nix
index 5111730ed..cf2ebfbd2 100644
--- a/lass/krops.nix
+++ b/lass/krops.nix
@@ -30,13 +30,11 @@ in {
   # usage: $(nix-build --no-out-link --argstr name HOSTNAME -A test)
   test = pkgs.krops.writeTest "${name}-test" {
     source = source { test = true; };
-    target = "${lib.getEnv "HOME"}/tmp/${name}-krops-test-src";
+    target = "${lib.getEnv "HOME"}/tmp/${name}-stockholm-test";
   };
 
-  ci = map (host:
-    pkgs.krops.writeTest "${host.name}-test" {
-      source = source { test = true; };
-      target = "${lib.getEnv "TMPDIR"}/lass/${host.name}";
-    }
-  ) (lib.filter (host: lib.getAttr "ci" host && host.owner == "lass") (lib.attrValues config.krebs.hosts));
+  ci = pkgs.krops.writeTest "${name}-test" {
+    source = source { test = true; };
+    target = "${lib.getEnv "HOME"}/stockholm-build";
+  };
 }
-- 
cgit v1.2.3


From 3376f0ace51510f8ad71d91a63b8bbdd9d9b0a41 Mon Sep 17 00:00:00 2001
From: lassulus <lass@blue.r>
Date: Fri, 7 Sep 2018 17:55:22 +0200
Subject: l krops: remove broken config arg

---
 lass/krops.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/krops.nix')

diff --git a/lass/krops.nix b/lass/krops.nix
index cf2ebfbd2..c5a932206 100644
--- a/lass/krops.nix
+++ b/lass/krops.nix
@@ -1,4 +1,4 @@
-{ config ? config, name }: let
+{ name }: let
   inherit (import ../krebs/krops.nix { inherit name; })
     krebs-source
     lib
-- 
cgit v1.2.3