nixos/clickhouse: Enable tests for clickhouse-lts

nixos/tests/all-tests.nix

@@ -333,7 +333,14 @@ in
   cinnamon-wayland = runTest ./cinnamon-wayland.nix;
   cjdns = runTest ./cjdns.nix;
   clatd = runTest ./clatd.nix;
-  clickhouse = import ./clickhouse { inherit runTest; };
+  clickhouse = import ./clickhouse {
+    inherit runTest;
+    package = pkgs.clickhouse;
+  };
+  clickhouse-lts = import ./clickhouse {
+    inherit runTest;
+    package = pkgs.clickhouse-lts;
+  };
   cloud-init = runTest ./cloud-init.nix;
   cloud-init-hostname = runTest ./cloud-init-hostname.nix;
   cloudlog = runTest ./cloudlog.nix;

nixos/tests/clickhouse/base.nix

@@ -1,10 +1,13 @@
-{ pkgs, ... }:
+{ pkgs, package, ... }:
 {
   name = "clickhouse";
   meta.maintainers = with pkgs.lib.maintainers; [ jpds ];
 
   nodes.machine = {
-    services.clickhouse.enable = true;
+    services.clickhouse = {
+      enable = true;
+      inherit package;
+    };
     virtualisation.memorySize = 4096;
   };
 

nixos/tests/clickhouse/default.nix

@@ -1,8 +1,31 @@
-{ runTest }:
+{
+  runTest,
+  package,
+}:
 
 {
-  base = runTest ./base.nix;
-  kafka = runTest ./kafka.nix;
-  keeper = runTest ./keeper.nix;
-  s3 = runTest ./s3.nix;
+  base = runTest {
+    imports = [ ./base.nix ];
+    _module.args = {
+      inherit package;
+    };
+  };
+  kafka = runTest {
+    imports = [ ./kafka.nix ];
+    _module.args = {
+      inherit package;
+    };
+  };
+  keeper = runTest {
+    imports = [ ./keeper.nix ];
+    _module.args = {
+      inherit package;
+    };
+  };
+  s3 = runTest {
+    imports = [ ./s3.nix ];
+    _module.args = {
+      inherit package;
+    };
+  };
 }

nixos/tests/clickhouse/kafka.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, package, ... }:
 
 let
   kafkaNamedCollectionConfig = ''
@@ -38,7 +38,10 @@ in
         };
       };
 
-      services.clickhouse.enable = true;
+      services.clickhouse = {
+        enable = true;
+        inherit package;
+      };
       virtualisation.memorySize = 4096;
     };
 

nixos/tests/clickhouse/keeper.nix

@@ -1,4 +1,9 @@
-{ lib, pkgs, ... }:
+{
+  lib,
+  pkgs,
+  package,
+  ...
+}:
 rec {
   name = "clickhouse-keeper";
   meta.maintainers = with pkgs.lib.maintainers; [ jpds ];
@@ -94,7 +99,10 @@ rec {
           9444
         ];
 
-        services.clickhouse.enable = true;
+        services.clickhouse = {
+          enable = true;
+          inherit package;
+        };
 
         systemd.services.clickhouse = {
           after = [ "network-online.target" ];

nixos/tests/clickhouse/s3.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, package, ... }:
 
 let
   s3 = {
@@ -50,7 +50,10 @@ in
         };
       };
 
-      services.clickhouse.enable = true;
+      services.clickhouse = {
+        enable = true;
+        inherit package;
+      };
       virtualisation.diskSize = 15 * 1024;
       virtualisation.memorySize = 4 * 1024;
     };

pkgs/by-name/cl/clickhouse/generic.nix

@@ -159,7 +159,7 @@ llvmPackages_19.stdenv.mkDerivation (finalAttrs: {
   requiredSystemFeatures = [ "big-parallel" ];
 
   passthru = {
-    tests.clickhouse = nixosTests.clickhouse;
+    tests.clickhouse = if lts then nixosTests.clickhouse-lts else nixosTests.clickhouse;
 
     updateScript = nix-update-script {
       extraArgs = nixUpdateExtraArgs;