diff options
| author | Euan Kemp <euank@euank.com> | 2022-07-21 23:13:20 -0700 |
|---|---|---|
| committer | Euan Kemp <euank@euank.com> | 2022-07-30 11:55:23 -0700 |
| commit | d5b1e25711c3451de8f6df7cb4c9148d7aed64c6 (patch) | |
| tree | a4541726bc3be746ed929a11072cb9fb7b2254da /nixos/tests | |
| parent | 97315301e0c39183f4474cdf940b31e53b9de3df (diff) | |
nixos/tests/k3s: reorganize test into a subdirectory
In preperation for more tests, coming soon.
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/all-tests.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/k3s/default.nix | 7 | ||||
| -rw-r--r-- | nixos/tests/k3s/single-node.nix (renamed from nixos/tests/k3s-single-node.nix) | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 03a7f17c07cc7..56a3eec7d6433 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -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 {}; diff --git a/nixos/tests/k3s/default.nix b/nixos/tests/k3s/default.nix new file mode 100644 index 0000000000000..e758ca162fa14 --- /dev/null +++ b/nixos/tests/k3s/default.nix @@ -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; }; +} diff --git a/nixos/tests/k3s-single-node.nix b/nixos/tests/k3s/single-node.nix index fb6510ee087bc..0f9fa8dea5af8 100644 --- a/nixos/tests/k3s-single-node.nix +++ b/nixos/tests/k3s/single-node.nix @@ -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"; |