From 7f136b5a5607059c3dca1967ffaca126e3d1fe29 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 14 Sep 2019 01:45:39 +0200 Subject: nixos/hydra: fix test We ship `https://cache.nixos.org` as binary cache by default which automatically substitutes the test derivation used inside the Hydra test. However it needs to be built locally to confirm that `hydra-queue-runner` works properly. Also inherited the platform name for the test derivation from `system` to ensure that the build can be tested on each supported platform. ZHF #68361 --- nixos/tests/hydra/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'nixos/tests') diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix index f99b367ac9b..76000450921 100644 --- a/nixos/tests/hydra/default.nix +++ b/nixos/tests/hydra/default.nix @@ -8,8 +8,10 @@ let trivialJob = pkgs.writeTextDir "trivial.nix" '' { trivial = builtins.derivation { name = "trivial"; - system = "x86_64-linux"; + system = "${system}"; builder = "/bin/sh"; + allowSubstitutes = false; + preferLocalBuild = true; args = ["-c" "echo success > $out; exit 0"]; }; } @@ -57,7 +59,7 @@ let nix = { buildMachines = [{ hostName = "localhost"; - systems = [ "x86_64-linux" ]; + systems = [ system ]; }]; binaryCaches = []; -- cgit v1.2.3