buildbot-stockholm: build using the test attribute

While at it, fix */krops.nix to actually use the target attribute.
This commit is contained in:
tv 2018-09-09 10:23:20 +02:00
parent d3c84b0d29
commit df809dca51
6 changed files with 15 additions and 40 deletions

View File

@ -27,14 +27,9 @@ in {
target = "root@${name}/var/src"; target = "root@${name}/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" { test = { target }: pkgs.krops.writeTest "${name}-test" {
inherit target;
source = source { test = true; }; 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";
}; };
} }

View File

@ -24,7 +24,7 @@ let
result=$(nix-build \ result=$(nix-build \
--argstr name "$host" \ --argstr name "$host" \
--argstr target "$HOME"/stockholm-build \ --argstr target "$HOME"/stockholm-build \
--attr ci \ --attr test \
--no-build-output \ --no-build-output \
--no-out-link \ --no-out-link \
--show-trace \ --show-trace \

View File

@ -55,14 +55,9 @@
target = "root@${name}/var/src"; target = "root@${name}/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" { test = { target }: pkgs.krops.writeTest "${name}-test" {
inherit target;
source = source { test = true; }; 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";
}; };
} }

View File

@ -27,14 +27,9 @@ in {
target = "root@${name}/var/src"; target = "root@${name}/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" { test = { target }: pkgs.krops.writeTest "${name}-test" {
inherit target;
source = source { test = true; }; 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";
}; };
} }

View File

@ -75,14 +75,9 @@ in {
target = "root@${target}/var/src"; 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" { test = pkgs.krops.writeTest "${name}-test" {
inherit target;
source = source { test = true; }; 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";
}; };
} }

View File

@ -27,14 +27,9 @@ in {
target = "root@${name}/var/src"; target = "root@${name}/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" { test = { target }: pkgs.krops.writeTest "${name}-test" {
inherit target;
source = source { test = true; }; 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";
}; };
} }