diff options
| author | tv <tv@krebsco.de> | 2018-09-09 10:23:20 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2018-09-09 10:25:02 +0200 |
| commit | 3f30281977129844af090e0524fcc054f256e74b (patch) | |
| tree | 049605835a2c75061bcc3130c8d36fdaab615bc6 | |
| parent | 993661bb636dcbd2eace2ed7fc6219d1f5c14df8 (diff) | |
buildbot-stockholm: build using the test attribute
While at it, fix */krops.nix to actually use the target attribute.
| -rw-r--r-- | jeschli/krops.nix | 11 | ||||
| -rw-r--r-- | nin/krops.nix | 11 |
2 files changed, 6 insertions, 16 deletions
diff --git a/jeschli/krops.nix b/jeschli/krops.nix index e55f207..34f3aaa 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/nin/krops.nix b/nin/krops.nix index 2ba8964..d007484 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"; }; } |