Commit d5b1e257 authored by Euan Kemp's avatar Euan Kemp
Browse files

nixos/tests/k3s: reorganize test into a subdirectory 

In preperation for more tests, coming soon.
parent 97315301

nixos/tests/all-tests.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 {};

nixos/tests/k3s/default.nix

0 → 100644
+7 −0
Original line number Diff line number Diff line 
{ 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; };

}

nixos/tests/k3s-single-node.nix→nixos/tests/k3s/single-node.nix

+1 −2
Original line number Diff line number Diff line 
import ./make-test-python.nix ({ pkgs, ... }:



import ../make-test-python.nix ({ pkgs, ... }:

  let

    imageEnv = pkgs.buildEnv {

      name = "k3s-pause-image-env";

pkgs/applications/networking/cluster/k3s/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ buildGoModule rec { 


  passthru.updateScript = ./update.sh;



  passthru.tests = { inherit (nixosTests) k3s-single-node; };

  passthru.tests = nixosTests.k3s;



  meta = baseMeta;

}