Unverified Commit 49bd3e5e authored by azey's avatar azey
Browse files

nixos/tests/{k3s,rke2}: migrate to runTest 

Also exposed a .all attr alongside existing tests, for easily running
all tests for all package versions.
parent e963fce1

nixos/tests/all-tests.nix

+14 −2
Original line number Diff line number Diff line
@@ -800,7 +800,11 @@ in 
  jitsi-meet = runTest ./jitsi-meet.nix;

  jool = import ./jool.nix { inherit pkgs runTest; };

  jotta-cli = runTest ./jotta-cli.nix;

  k3s = handleTest ./rancher { rancherDistro = "k3s"; };

  k3s = import ./rancher {

    inherit pkgs runTest;

    inherit (pkgs) lib;

    rancherDistro = "k3s";

  };

  kafka = handleTest ./kafka { };

  kanboard = runTest ./web-apps/kanboard.nix;

  kanidm = runTest ./kanidm.nix;
@@ -1346,7 +1350,15 @@ in 
  restic-rest-server = runTest ./restic-rest-server.nix;

  retroarch = runTest ./retroarch.nix;

  ringboard = runTest ./ringboard.nix;

  rke2 = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./rancher { rancherDistro = "rke2"; };

  rke2 = import ./rancher {

    inherit pkgs;

    inherit (pkgs) lib;

    runTest = runTestOn [

      "aarch64-linux"

      "x86_64-linux"

    ];

    rancherDistro = "rke2";

  };

  rkvm = handleTest ./rkvm { };

  rmfakecloud = runTest ./rmfakecloud.nix;

  robustirc-bridge = runTest ./robustirc-bridge.nix;

nixos/tests/rancher/airgap-images.nix

+34 −36
Original line number Diff line number Diff line 
# A test that imports k3s airgapped images and verifies that all expected images are present

import ../make-test-python.nix (

{

  pkgs,

  lib,
@@ -39,4 +38,3 @@ import ../make-test-python.nix ( 


  meta.maintainers = lib.teams.k3s.members ++ pkgs.rke2.meta.maintainers;

}
 
)

nixos/tests/rancher/auto-deploy-charts.nix

+207 −209
Original line number Diff line number Diff line 
# Tests whether container images are imported and auto deploying Helm charts,

# including the bundled traefik or ingress-nginx, work

import ../make-test-python.nix (

{

  pkgs,

  lib,
@@ -229,4 +228,3 @@ import ../make-test-python.nix ( 


  meta.maintainers = lib.teams.k3s.members ++ pkgs.rke2.meta.maintainers;

}
 
)

nixos/tests/rancher/auto-deploy.nix

+115 −117
Original line number Diff line number Diff line 
# Tests whether container images are imported and auto deploying manifests work

import ../make-test-python.nix (

{

  pkgs,

  lib,
@@ -133,4 +132,3 @@ import ../make-test-python.nix ( 


  meta.maintainers = lib.teams.k3s.members ++ pkgs.rke2.meta.maintainers;

}
 
)

nixos/tests/rancher/containerd-config.nix

+52 −54
Original line number Diff line number Diff line 
# A test that containerdConfigTemplate settings get written to containerd/config.toml

import ../make-test-python.nix (

{

  pkgs,

  lib,
@@ -58,4 +57,3 @@ import ../make-test-python.nix ( 


  meta.maintainers = lib.teams.k3s.members ++ pkgs.rke2.meta.maintainers;

}
 
)