Browse Source

nixos/tests/chromium: Re-add map for all channels

This partially reverts f2d24b9840.

Instead of disabling the channels via removing the channel mapping from
the tests themselves, let's just explicitly reference the stable test in
release.nix. That way it's still possible to run the beta and dev tests
via something like "nix-build nixos/tests/chromium.nix -A beta" and
achieve the same effect of not building beta and dev versions on Hydra.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
nsd-state-dir
aszlig 7 years ago
parent
commit
f35e9386bd
No known key found for this signature in database GPG Key ID: D0EBD0EC8C2DC961
  1. 2
      nixos/release.nix
  2. 2
      nixos/tests/chromium.nix

2
nixos/release.nix

@ -210,7 +210,7 @@ in rec {
tests.blivet = callTest tests/blivet.nix {};
tests.boot = callSubTests tests/boot.nix {};
tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; });
tests.chromium = callSubTests tests/chromium.nix { system = "x86_64-linux"; };
tests.chromium = (callSubTests tests/chromium.nix { system = "x86_64-linux"; }).stable;
tests.cjdns = callTest tests/cjdns.nix {};
tests.containers-ipv4 = callTest tests/containers-ipv4.nix {};
tests.containers-ipv6 = callTest tests/containers-ipv6.nix {};

2
nixos/tests/chromium.nix

@ -2,6 +2,8 @@
, pkgs ? import ../.. { inherit system; }
, channelMap ? {
stable = pkgs.chromium;
beta = pkgs.chromiumBeta;
dev = pkgs.chromiumDev;
}
}:

Loading…
Cancel
Save