From 94036cabda974cdbefeac0821d022480b9009fa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 7 Sep 2017 21:11:06 +0200 Subject: [PATCH] nixos/release*: fixup evaluation of the tested job --- nixos/release-combined.nix | 4 ++-- nixos/release.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 6f6253e330b7..7e1b01c3081b 100644 --- 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 index a893a64df1c2..5c4ac7752cf5 100644 --- 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; };