From 254b032319daf9a33b6501804b3268f79c4b1d32 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 3 Oct 2022 15:48:52 +0200 Subject: tests: Return test attr instead of option defs Introduced by a recent change[1], all NixOS VM tests are evaluated using the NixOS module system and with [2], makeTest doesn't return a derivation anymore but the .config attribute of the module system evaluation. This however doesn't work very well when thrown into Hydra, which traverses through all attributes recursively looking for derivations. We had our fair share of OOMs on our Hydra evaluator and right now, some jobsets are still getting evaluation timouts, one of them is due to the fact that we use makeTest without returning the actual test derivation. [1]: https://github.com/NixOS/nixpkgs/pull/191540 [2]: https://github.com/NixOS/nixpkgs/commit/aed1deab0574f663be2d401861b Signed-off-by: aszlig --- tests/make-test.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/make-test.nix b/tests/make-test.nix index 39586932..5a365e8d 100644 --- a/tests/make-test.nix +++ b/tests/make-test.nix @@ -32,4 +32,4 @@ testFun: nodes = lib.mapAttrs injectCommon nodes; }; -in testLib.makeTest testArgsWithCommon +in (testLib.makeTest testArgsWithCommon).test -- cgit 1.4.1