nixosTests.victoriametrics: handleTest -> runTest

nixos/tests/all-tests.nix

@@ -1511,7 +1511,7 @@ in
   velocity = runTest ./velocity.nix;
   vengi-tools = runTest ./vengi-tools.nix;
   victorialogs = runTest ./victorialogs.nix;
-  victoriametrics = handleTest ./victoriametrics { };
+  victoriametrics = import ./victoriametrics { inherit runTest; };
   vikunja = runTest ./vikunja.nix;
   virtualbox = handleTestOn [ "x86_64-linux" ] ./virtualbox.nix { };
   vm-variant = handleTest ./vm-variant.nix { };

nixos/tests/victoriametrics/default.nix

@@ -1,11 +1,6 @@
+{ runTest }:
 {
-  system ? builtins.currentSystem,
+  remote-write = runTest ./remote-write.nix;
-  config ? { },
+  vmalert = runTest ./vmalert.nix;
-  pkgs ? import ../../.. { inherit system config; },
+  external-promscrape-config = runTest ./external-promscrape-config.nix;
-}:
-
-{
-  remote-write = import ./remote-write.nix { inherit system pkgs; };
-  vmalert = import ./vmalert.nix { inherit system pkgs; };
-  external-promscrape-config = import ./external-promscrape-config.nix { inherit system pkgs; };
 }

nixos/tests/victoriametrics/external-promscrape-config.nix

@@ -1,10 +1,5 @@
-import ../make-test-python.nix (
+{ lib, pkgs, ... }:
-  {
+let
-    lib,
-    pkgs,
-    ...
-  }:
-  let
   nodeExporterPort = 9100;
   promscrapeConfig = {
     global = {
@@ -25,10 +20,10 @@ import ../make-test-python.nix (
   };
   settingsFormat = pkgs.formats.yaml { };
   promscrapeConfigYaml = settingsFormat.generate "prometheusConfig.yaml" promscrapeConfig;
-  in
+in
-  {
+{
   name = "victoriametrics-external-promscrape-config";
-    meta = with pkgs.lib.maintainers; {
+  meta = with lib.maintainers; {
     maintainers = [
       ryan4yin
     ];
@@ -36,11 +31,7 @@ import ../make-test-python.nix (
 
   nodes = {
     victoriametrics =
-        {
+      { pkgs, ... }:
-          config,
-          pkgs,
-          ...
-        }:
       {
         environment.systemPackages = [ pkgs.jq ];
         networking.firewall.allowedTCPPorts = [ 8428 ];
@@ -52,9 +43,7 @@ import ../make-test-python.nix (
         };
       };
 
-      node =
+    node = {
-        { ... }:
-        {
       services.prometheus.exporters.node = {
         enable = true;
         openFirewall = true;
@@ -78,5 +67,4 @@ import ../make-test-python.nix (
       + "jq '.data.result[0].value[1]' | grep '\"1\"'"
     )
   '';
-  }
+}
-)

nixos/tests/victoriametrics/remote-write.nix

@@ -1,18 +1,13 @@
 # Primarily reference the implementation of <nixos/tests/prometheus/remote-write.nix>
-import ../make-test-python.nix (
+{ lib, pkgs, ... }:
-  {
+let
-    lib,
-    pkgs,
-    ...
-  }:
-  let
   username = "vmtest";
   password = "fsddfy8233rb"; # random string
   passwordFile = pkgs.writeText "password-file" password;
-  in
+in
-  {
+{
   name = "victoriametrics-remote-write";
-    meta = with pkgs.lib.maintainers; {
+  meta = with lib.maintainers; {
     maintainers = [
       yorickvp
       ryan4yin
@@ -21,11 +16,7 @@ import ../make-test-python.nix (
 
   nodes = {
     victoriametrics =
-        {
+      { pkgs, ... }:
-          config,
-          pkgs,
-          ...
-        }:
       {
         environment.systemPackages = [ pkgs.jq ];
         networking.firewall.allowedTCPPorts = [ 8428 ];
@@ -39,11 +30,7 @@ import ../make-test-python.nix (
       };
 
     vmagent =
-        {
+      { config, pkgs, ... }:
-          config,
-          pkgs,
-          ...
-        }:
       {
         environment.systemPackages = [ pkgs.jq ];
         services.vmagent = {
@@ -74,9 +61,7 @@ import ../make-test-python.nix (
         };
       };
 
-      node =
+    node = {
-        { ... }:
-        {
       services.prometheus.exporters.node = {
         enable = true;
         openFirewall = true;
@@ -99,5 +84,4 @@ import ../make-test-python.nix (
       + "jq '.data.result[0].value[1]' | grep '\"1\"'"
     )
   '';
-  }
+}
-)

nixos/tests/victoriametrics/vmalert.nix

@@ -1,13 +1,8 @@
 # Primarily reference the implementation of <nixos/tests/prometheus/alertmanager.nix>
-import ../make-test-python.nix (
+{ lib, pkgs, ... }:
-  {
+{
-    lib,
-    pkgs,
-    ...
-  }:
-  {
   name = "victoriametrics-vmalert";
-    meta = with pkgs.lib.maintainers; {
+  meta = with lib.maintainers; {
     maintainers = [
       yorickvp
       ryan4yin
@@ -16,11 +11,7 @@ import ../make-test-python.nix (
 
   nodes = {
     victoriametrics =
-        {
+      { config, pkgs, ... }:
-          config,
-          pkgs,
-          ...
-        }:
       {
         environment.systemPackages = [ pkgs.jq ];
         networking.firewall.allowedTCPPorts = [ 8428 ];
@@ -80,13 +71,7 @@ import ../make-test-python.nix (
         };
       };
 
-      alertmanager =
+    alertmanager = {
-        {
-          config,
-          pkgs,
-          ...
-        }:
-        {
       services.prometheus.alertmanager = {
         enable = true;
         openFirewall = true;
@@ -122,13 +107,7 @@ import ../make-test-python.nix (
       };
     };
 
-      logger =
+    logger = {
-        {
-          config,
-          pkgs,
-          ...
-        }:
-        {
       networking.firewall.allowedTCPPorts = [ 6725 ];
 
       services.prometheus.alertmanagerWebhookLogger.enable = true;
@@ -175,5 +154,4 @@ import ../make-test-python.nix (
 
     alertmanager.log(alertmanager.succeed("systemd-analyze security alertmanager.service | grep -v '✓'"))
   '';
-  }
+}
-)