gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

k3s: add passthru.tests to all derivations

Browse Source
This commit is contained in:
Jairo Llopis
2023-02-13 08:33:20 +00:00
parent 52a153aae2
commit f0a6595fe5
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/cluster/k3s/1_23/default.nix
+1 -2
View File
@@ -324,8 +324,7 @@ buildGoModule rec {
# Fix-Me: Needs to be adapted specifically for 1.23
# passthru.updateScript = ./update.sh;
# Fix-Me: Needs to be adapted specifically for 1.23
# passthru.tests = { inherit (nixosTests) k3s-single-node k3s-single-node-docker; };
passthru.tests = k3s.passthru.mkTests k3sVersion;
meta = baseMeta;
}
pkgs/applications/networking/cluster/k3s/1_24/default.nix
+1 -2
View File
@@ -322,8 +322,7 @@ buildGoModule rec {
# Fix-Me: Needs to be adapted specifically for 1.24
# passthru.updateScript = ./update.sh;
# Fix-Me: Needs to be adapted specifically for 1.24
# passthru.tests = nixosTests.k3s;
passthru.tests = k3s.passthru.mkTests k3sVersion;
meta = baseMeta;
}
pkgs/applications/networking/cluster/k3s/1_25/default.nix
+1 -2
View File
@@ -322,8 +322,7 @@ buildGoModule rec {
# Fix-Me: Needs to be adapted specifically for 1.25
# passthru.updateScript = ./update.sh;
# Fix-Me: Needs to be adapted specifically for 1.25
# passthru.tests = nixosTests.k3s;
passthru.tests = k3s.passthru.mkTests k3sVersion;
meta = baseMeta;
}
pkgs/applications/networking/cluster/k3s/1_26/default.nix
+8 -1
View File
@@ -319,7 +319,14 @@ buildGoModule rec {
passthru.updateScript = ./update.sh;
passthru.tests = nixosTests.k3s;
passthru.mkTests = version:
let k3s_version = "k3s_" + lib.replaceStrings ["."] ["_"] (lib.versions.majorMinor version);
in {
single-node = nixosTests.k3s.single-node.${k3s_version};
multi-node = nixosTests.k3s.multi-node.${k3s_version};
};
passthru.tests = passthru.mkTests k3sVersion;
meta = baseMeta;
}