diff options
| author | superherointj <5861043+superherointj@users.noreply.github.com> | 2023-02-14 12:31:32 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-14 12:31:32 -0300 |
| commit | e836805076c1c3b4f19b2023cc7b8c486df62a8b (patch) | |
| tree | ac5444da996282bc3b481fb27439a9259da2d93e /pkgs/applications/networking/cluster/k3s | |
| parent | 3d53723112c6045bd6534ebeb536056fec5a16f8 (diff) | |
| parent | 0ca947e125c56e01d2b0471eaebb60902a2c412a (diff) | |
| download | nixlib-e836805076c1c3b4f19b2023cc7b8c486df62a8b.tar nixlib-e836805076c1c3b4f19b2023cc7b8c486df62a8b.tar.gz nixlib-e836805076c1c3b4f19b2023cc7b8c486df62a8b.tar.bz2 nixlib-e836805076c1c3b4f19b2023cc7b8c486df62a8b.tar.lz nixlib-e836805076c1c3b4f19b2023cc7b8c486df62a8b.tar.xz nixlib-e836805076c1c3b4f19b2023cc7b8c486df62a8b.tar.zst nixlib-e836805076c1c3b4f19b2023cc7b8c486df62a8b.zip | |
Merge pull request #215482 from moduon/k3s-test-all-versions
k3s: test all versions
Diffstat (limited to 'pkgs/applications/networking/cluster/k3s')
4 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/applications/networking/cluster/k3s/1_23/default.nix b/pkgs/applications/networking/cluster/k3s/1_23/default.nix index 3865cb0a06e1..72fbe89dd6b3 100644 --- a/pkgs/applications/networking/cluster/k3s/1_23/default.nix +++ b/pkgs/applications/networking/cluster/k3s/1_23/default.nix @@ -320,8 +320,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; } diff --git a/pkgs/applications/networking/cluster/k3s/1_24/default.nix b/pkgs/applications/networking/cluster/k3s/1_24/default.nix index 18e0258432ee..11037db5b6d3 100644 --- a/pkgs/applications/networking/cluster/k3s/1_24/default.nix +++ b/pkgs/applications/networking/cluster/k3s/1_24/default.nix @@ -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; } diff --git a/pkgs/applications/networking/cluster/k3s/1_25/default.nix b/pkgs/applications/networking/cluster/k3s/1_25/default.nix index dc34821fb255..b62eec692855 100644 --- a/pkgs/applications/networking/cluster/k3s/1_25/default.nix +++ b/pkgs/applications/networking/cluster/k3s/1_25/default.nix @@ -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; } diff --git a/pkgs/applications/networking/cluster/k3s/1_26/default.nix b/pkgs/applications/networking/cluster/k3s/1_26/default.nix index 144e1116bb15..cef2355a3da6 100644 --- a/pkgs/applications/networking/cluster/k3s/1_26/default.nix +++ b/pkgs/applications/networking/cluster/k3s/1_26/default.nix @@ -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; } |