diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-05-04 18:36:08 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-05-04 18:45:44 +0200 |
| commit | f35e9386bd7e063f843f1b33b35c0c2757aade55 (patch) | |
| tree | 01b0201df5c4100e228e9eb4ce44d70be6e4f819 /nixos | |
| parent | 1eab39cdce8d59660ef3000cd7c6b8684a720dca (diff) | |
| download | nixlib-f35e9386bd7e063f843f1b33b35c0c2757aade55.tar nixlib-f35e9386bd7e063f843f1b33b35c0c2757aade55.tar.gz nixlib-f35e9386bd7e063f843f1b33b35c0c2757aade55.tar.bz2 nixlib-f35e9386bd7e063f843f1b33b35c0c2757aade55.tar.lz nixlib-f35e9386bd7e063f843f1b33b35c0c2757aade55.tar.xz nixlib-f35e9386bd7e063f843f1b33b35c0c2757aade55.tar.zst nixlib-f35e9386bd7e063f843f1b33b35c0c2757aade55.zip | |
nixos/tests/chromium: Re-add map for all channels
This partially reverts f2d24b98408b48c2179b131fa4c3700dc41f5b52. 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>
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/release.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/chromium.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nixos/release.nix b/nixos/release.nix index f632f36d3fed..97f6df16dc99 100644 --- a/nixos/release.nix +++ b/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 {}; diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 1053b777a61b..9a6414f81c39 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -2,6 +2,8 @@ , pkgs ? import ../.. { inherit system; } , channelMap ? { stable = pkgs.chromium; + beta = pkgs.chromiumBeta; + dev = pkgs.chromiumDev; } }: |