summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jeschli/krops.nix11
-rw-r--r--krebs/2configs/buildbot-stockholm.nix2
-rw-r--r--krebs/krops.nix11
-rw-r--r--lass/krops.nix11
-rw-r--r--makefu/krops.nix9
-rw-r--r--nin/krops.nix11
6 files changed, 15 insertions, 40 deletions
diff --git a/jeschli/krops.nix b/jeschli/krops.nix
index e55f207d3..34f3aaa53 100644
--- a/jeschli/krops.nix
+++ b/jeschli/krops.nix
@@ -27,14 +27,9 @@ in {
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}-stockholm-test";
- };
-
- ci = pkgs.krops.writeTest "${name}-test" {
- source = source { test = true; };
- target = "${lib.getEnv "HOME"}/stockholm-build";
};
}
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";
};
}
diff --git a/lass/krops.nix b/lass/krops.nix
index c5a932206..4e045c6db 100644
--- a/lass/krops.nix
+++ b/lass/krops.nix
@@ -27,14 +27,9 @@ in {
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}-stockholm-test";
- };
-
- ci = pkgs.krops.writeTest "${name}-test" {
- source = source { test = true; };
- target = "${lib.getEnv "HOME"}/stockholm-build";
};
}
diff --git a/makefu/krops.nix b/makefu/krops.nix
index 9a701dcac..30385c10e 100644
--- a/makefu/krops.nix
+++ b/makefu/krops.nix
@@ -75,14 +75,9 @@ in {
target = "root@${target}/var/src";
};
- # usage: $(nix-build --no-out-link --argstr name HOSTNAME -A test)
+ # usage: $(nix-build --no-out-link --argstr name HOSTNAME --argstr target PATH -A test)
test = 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";
};
}
diff --git a/nin/krops.nix b/nin/krops.nix
index 2ba896419..d0074840a 100644
--- a/nin/krops.nix
+++ b/nin/krops.nix
@@ -27,14 +27,9 @@ in {
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}-stockholm-test";
- };
-
- ci = pkgs.krops.writeTest "${name}-test" {
- source = source { test = true; };
- target = "${lib.getEnv "HOME"}/stockholm-build";
};
}