Unverified Commit f0a6595f authored by Jairo Llopis's avatar Jairo Llopis
Browse files

k3s: add passthru.tests to all derivations

parent 52a153aa

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

+1 −2
Original line number Diff line number Diff line
@@ -324,8 +324,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;

}

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

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

}

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

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

}

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

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

}