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 | df809dca51b2a4037449d626e14a75aa91be7b3a (patch) | |
| tree | 1ed7889762e67d92c880d20315e8f3fb66915396 /krebs | |
| parent | d3c84b0d2981f46574046e19d8e3d618065b92a0 (diff) | |
buildbot-stockholm: build using the test attribute
While at it, fix */krops.nix to actually use the target attribute.
Diffstat (limited to 'krebs')
| -rw-r--r-- | krebs/2configs/buildbot-stockholm.nix | 2 | ||||
| -rw-r--r-- | krebs/krops.nix | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix index add27f39..0aa9288e 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 c71e6057..5378d6fb 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"; }; } |