From e7227cfe8cb0426936e1fb0e15e66a9471eea8b0 Mon Sep 17 00:00:00 2001 From: GTrunSec Date: Sat, 2 Apr 2022 14:07:05 -0700 Subject: [PATCH] WIP: IFD issue --- flake.nix | 11 +++++++---- modules/submodules.nix | 7 +++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 875c222..f2d1e4c 100644 --- a/flake.nix +++ b/flake.nix @@ -76,13 +76,16 @@ else pkgs.runCommandNoCC "testing-suite-config-assertions-for-${suite.name}-failed" {} "exit 1"; mkExamples = attrs: (import ./examples {inherit evalModules;}) - ({registry = "docker.io/gatehub";} // attrs); + ({registry = "docker.io/gatehub";} // attrs); + mkK8STests = attrs: + (import ./tests {inherit evalModules;}) + ({registry = "docker.io/gatehub";} // attrs); in { # TODO: access "success" derivation with nice testing utils for nice output nginx-example = wasSuccess (mkExamples {}).nginx-deployment.config.testing; - #tests-k8s-1_19 = wasSuccess (mkK8STests {k8sVersion = "1.19";}); - # tests-k8s-1_20 = wasSuccess (mkK8STests {k8sVersion = "1.20";}); - # tests-k8s-1_21 = wasSuccess (mkK8STests {k8sVersion = "1.21";}); + tests-k8s-1_19 = wasSuccess (mkK8STests {k8sVersion = "1.19";}); + tests-k8s-1_20 = wasSuccess (mkK8STests {k8sVersion = "1.20";}); + tests-k8s-1_21 = wasSuccess (mkK8STests {k8sVersion = "1.21";}); }; } )) diff --git a/modules/submodules.nix b/modules/submodules.nix index 5abec05..5ad92f9 100644 --- a/modules/submodules.nix +++ b/modules/submodules.nix @@ -236,8 +236,11 @@ in { }: let evaledSubmodule' = evalModules { inherit specialArgs; - modules = config.modules ++ [./base.nix]; - check = false; + modules = config.modules ++ [./base.nix] ++ [ + { + _module.args.check = false; + } + ]; }; evaledSubmodule =