diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-09-07 21:11:06 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-09-07 21:52:28 +0200 |
| commit | 94036cabda974cdbefeac0821d022480b9009fa2 (patch) | |
| tree | 16f2cfe032ac3d274c80a57c4e8a47ab733bd3ef /nixos | |
| parent | c24820db93afe3dbffba2d9031c0c496029e363d (diff) | |
| download | nixpkgs-94036cabda974cdbefeac0821d022480b9009fa2.tar nixpkgs-94036cabda974cdbefeac0821d022480b9009fa2.tar.gz nixpkgs-94036cabda974cdbefeac0821d022480b9009fa2.tar.bz2 nixpkgs-94036cabda974cdbefeac0821d022480b9009fa2.tar.lz nixpkgs-94036cabda974cdbefeac0821d022480b9009fa2.tar.xz nixpkgs-94036cabda974cdbefeac0821d022480b9009fa2.tar.zst nixpkgs-94036cabda974cdbefeac0821d022480b9009fa2.zip | |
nixos/release*: fixup evaluation of the tested job
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/release-combined.nix | 4 | ||||
| -rw-r--r-- | nixos/release.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 6f6253e330b..7e1b01c3081 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 a893a64df1c..5c4ac7752cf 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; }; |