nixos/release*: fixup evaluation of the tested job

NixOS · Sep 7, 2017 · 94036ca · NeQuissimus · Sep 7, 2017 · vcunat
1 parent c24820d
commit 94036ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
@@ -81,8 +81,8 @@ in rec {
         (all nixos.tests.boot.uefiUsb)
         (all nixos.tests.boot-stage1)
         nixos.tests.hibernate.x86_64-linux # i686 is flaky, see #23107
-        nixos.tests.docker.x86_64-linux
-        nixos.tests.docker-edge.x86_64-linux
+        nixos.tests.docker
+        nixos.tests.docker-edge
         (all nixos.tests.ecryptfs)
         (all nixos.tests.env)
         (all nixos.tests.ipv6)

diff --git a/nixos/release.nix b/nixos/release.nix
@@ -264,9 +264,9 @@ in rec {
   tests.keymap = callSubTests tests/keymap.nix {};
   tests.initrdNetwork = callTest tests/initrd-network.nix {};
   tests.kernel-copperhead = tests/kernel-copperhead.nix {};
-  tests.kernel-latest = tests/kernel-latest.nix {};
-  tests.kernel-lts = tests/kernel-lts.nix {};
-  tests.kernel-params = tests/kernel-params.nix {};
+  tests.kernel-latest = callTest tests/kernel-latest.nix {};
+  tests.kernel-lts = callTest tests/kernel-lts.nix {};
+  tests.kernel-params = callTest tests/kernel-params.nix {};
   tests.keystone = callTest tests/keystone.nix {};
   tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; });
   tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };