summaryrefslogtreecommitdiffstats
path: root/lass/krops.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-09-08 18:53:49 +0200
committermakefu <github@syntax-fehler.de>2018-09-08 18:53:49 +0200
commite7dd1d0e65b267821811afdb7767669bf79be301 (patch)
tree05bd4d080c203b57cfcdeb3609ddfba96c7369e2 /lass/krops.nix
parent7d8825a33ec80b396c1aa3bed5b420ac2ea9abdc (diff)
parent8639e4008a34e5e7d68202a621ef8c95fe3087f4 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/krops.nix')
-rw-r--r--lass/krops.nix16
1 files changed, 7 insertions, 9 deletions
diff --git a/lass/krops.nix b/lass/krops.nix
index 776a3a55d..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
@@ -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";
@@ -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";
+ };
}