summaryrefslogtreecommitdiffstats
path: root/nixos/release-combined.nix
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2020-02-09 16:00:47 -0500
committerworldofpeace <worldofpeace@protonmail.ch>2020-02-09 16:03:00 -0500
commitbf49181373643d3e2df1a06cb6e1efde1a2dec3e (patch)
tree4f2397bef1b64e7e0177e6562a427beefcb9b797 /nixos/release-combined.nix
parent89e9f68549f312d7b500f9cfe14c3f1d95ae2299 (diff)
release-combined: readd keymap tests
These are building just fine for a while now [0]. I restricted them from bulding on aarch64-linux because there's still issues there. [0]: https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.keymap.dvorak.x86_64-linux/all
Diffstat (limited to 'nixos/release-combined.nix')
-rw-r--r--nixos/release-combined.nix14
1 files changed, 6 insertions, 8 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index b46731863cab..641699818769 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -95,14 +95,12 @@ in rec {
(all nixos.tests.env)
(all nixos.tests.ipv6)
(all nixos.tests.i3wm)
- # 2018-06-06: keymap tests temporarily removed from tested job
- # since non-deterministic failure are blocking the channel (#41538)
- #(all nixos.tests.keymap.azerty)
- #(all nixos.tests.keymap.colemak)
- #(all nixos.tests.keymap.dvorak)
- #(all nixos.tests.keymap.dvp)
- #(all nixos.tests.keymap.neo)
- #(all nixos.tests.keymap.qwertz)
+ (except ["aarch64-linux"] nixos.tests.keymap.azerty)
+ (except ["aarch64-linux"] nixos.tests.keymap.colemak)
+ (except ["aarch64-linux"] nixos.tests.keymap.dvorak)
+ (except ["aarch64-linux"] nixos.tests.keymap.dvp)
+ (except ["aarch64-linux"] nixos.tests.keymap.neo)
+ (except ["aarch64-linux"] nixos.tests.keymap.qwertz)
(all nixos.tests.plasma5)
(all nixos.tests.lightdm)
(all nixos.tests.login)