mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

nixos/tests/k3s: reorganize test into a subdirectory

Browse source 
In preperation for more tests, coming soon.
This commit is contained in:
Euan Kemp 2022-07-21 23:13:20 -07:00
parent 97315301e0
commit d5b1e25711
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View file

@ -254,7 +254,7 @@ in {
jibri = handleTest ./jibri.nix {};
jirafeau = handleTest ./jirafeau.nix {};
jitsi-meet = handleTest ./jitsi-meet.nix {};
k3s-single-node = handleTest ./k3s-single-node.nix {};
k3s = handleTest ./k3s {};
kafka = handleTest ./kafka.nix {};
kanidm = handleTest ./kanidm.nix {};
kbd-setfont-decompress = handleTest ./kbd-setfont-decompress.nix {};

7
nixos/tests/k3s/default.nix Normal file
View file

@ -0,0 +1,7 @@
{ system ? builtins.currentSystem
, pkgs ? import ../../.. { inherit system; }
}:
{
# Run a single node k3s cluster and verify a pod can run
single-node = import ./single-node.nix { inherit system pkgs; };
}

3
nixos/tests/k3s-single-node.nix → nixos/tests/k3s/single-node.nix
View file

@ -1,5 +1,4 @@
import ./make-test-python.nix ({ pkgs, ... }:
import ../make-test-python.nix ({ pkgs, ... }:
let
imageEnv = pkgs.buildEnv {
name = "k3s-pause-image-env";

2
pkgs/applications/networking/cluster/k3s/default.nix
View file

@ -323,7 +323,7 @@ buildGoModule rec {
passthru.updateScript = ./update.sh;
passthru.tests = { inherit (nixosTests) k3s-single-node; };
passthru.tests = nixosTests.k3s;
meta = baseMeta;
}