technofab/kubenix
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/kubenix.git synced 2025-12-12 16:10:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve ci

Browse source
This commit is contained in:
Jaka Hudoklin 2019-05-05 12:13:09 +02:00
parent 7e7eb19e94
commit 12a6b509a4
No known key found for this signature in database
GPG key ID: 916062A1C4748647
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ci.nix
View file

@ -6,7 +6,6 @@ let
release = import ./release.nix { release = import ./release.nix {
inherit pkgs lib; inherit pkgs lib;
e2e = false;
nixosPath = "${nixpkgsSrc}/nixos"; nixosPath = "${nixpkgsSrc}/nixos";
}; };
in with lib; release.tests in pkgs.recurseIntoAttrs release

17
release.nix
View file

@ -19,11 +19,9 @@ let
inherit (pkgs) lib; inherit (pkgs) lib;
}; };
runK8STests = k8sVersion: pkgs.recurseIntoAttrs (getAttrs ["result" "results" "success"] runK8STests = k8sVersion: import ./tests {
(import ./tests { inherit pkgs lib kubenix k8sVersion e2e throwError nixosPath;
inherit pkgs lib kubenix k8sVersion e2e throwError nixosPath; };
})
);
in rec { in rec {
generate.k8s = pkgs.linkFarm "k8s-generated.nix" [{ generate.k8s = pkgs.linkFarm "k8s-generated.nix" [{
name = "v1.7.nix"; name = "v1.7.nix";
@ -88,7 +86,7 @@ in rec {
path = generateIstio; path = generateIstio;
}]; }];
tests = pkgs.recurseIntoAttrs { tests = {
k8s-1_7 = runK8STests "1.7"; k8s-1_7 = runK8STests "1.7";
k8s-1_8 = runK8STests "1.8"; k8s-1_8 = runK8STests "1.8";
k8s-1_9 = runK8STests "1.9"; k8s-1_9 = runK8STests "1.9";
@ -98,8 +96,13 @@ in rec {
k8s-1_13 = runK8STests "1.13"; k8s-1_13 = runK8STests "1.13";
}; };
test-results = pkgs.recurseIntoAttrs (mapAttrs (_: t: pkgs.recurseIntoAttrs {
results = pkgs.recurseIntoAttrs t.results;
result = t.result;
}) tests);
test-check = test-check =
if !(all (test: if isAttrs test then test.success else true) (attrValues tests)) if !(all (test: test.success) (attrValues tests))
then throw "tests failed" then throw "tests failed"
else true; else true;