Merge pull request #227 from ngi-nix/projects-interactive-conf

projects: create a default interactive configuration for NixOS tests
ngi-nix · May 14, 2024 · 17c5cb6 · 17c5cb6
2 parents d2a65d9 + e98ada4
commit 17c5cb6
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 71 deletions.
diff --git a/projects/Kbin/test.nix b/projects/Kbin/test.nix
@@ -55,31 +55,4 @@ in {
         server.wait_for_unit("nginx.service")
         server.succeed("curl --fail --connect-timeout 10 http://localhost/u/admin")
   '';
-
-  # NOTE: Below configuration is for "interactive" (=developing/debugging) only.
-  interactive.nodes = let
-    tools = {pkgs, ...}: {
-      environment.systemPackages = with pkgs; [vim tmux jq];
-    };
-
-    # Use kmscon <https://www.freedesktop.org/wiki/Software/kmscon/>
-    # to provide a slightly nicer console, and while we're at it,
-    # also use a nice font.
-    # With kmscon, we can for example zoom in/out using [Ctrl] + [+]
-    # and [Ctrl] + [-]
-    niceConsoleAndAutologin = {pkgs, ...}: {
-      services.kmscon = {
-        enable = true;
-        autologinUser = "root";
-        fonts = [
-          {
-            name = "Fira Code";
-            package = pkgs.fira-code;
-          }
-        ];
-      };
-    };
-  in {
-    server.imports = [niceConsoleAndAutologin tools];
-  };
 }
diff --git a/projects/Rosenpass/tests/default.nix b/projects/Rosenpass/tests/default.nix
@@ -181,26 +181,4 @@ in {
         for machine in [server, client]:
             machine.wait_until_succeeds("wg show all preshared-keys | grep --invert-match none", timeout=5)
   '';
-
-  # NOTE: Below configuration is for "interactive" (=developing/debugging) only.
-  interactive.nodes = let
-    # Use kmscon <https://www.freedesktop.org/wiki/Software/kmscon/>
-    # to provide a slightly nicer console, and while we're at it,
-    # also use a nice font.
-    # With kmscon, we can for example zoom in/out using [Ctrl] + [+]
-    # and [Ctrl] + [-]
-    niceConsoleAndAutologin.services.kmscon = {
-      enable = true;
-      autologinUser = "root";
-      fonts = [
-        {
-          name = "Fira Code";
-          package = pkgs.fira-code;
-        }
-      ];
-    };
-  in {
-    server = niceConsoleAndAutologin;
-    client = niceConsoleAndAutologin;
-  };
 }
diff --git a/projects/Vula/test.nix b/projects/Vula/test.nix
@@ -18,25 +18,4 @@
   testScript = {nodes, ...}: ''
     start_all()
   '';
-
-  # NOTE: Below configuration is for "interactive" (=developing/debugging) only.
-  interactive.nodes = let
-    # Use kmscon <https://www.freedesktop.org/wiki/Software/kmscon/>
-    # to provide a slightly nicer console, and while we're at it,
-    # also use a nice font.
-    # With kmscon, we can for example zoom in/out using [Ctrl] + [+]
-    # and [Ctrl] + [-]
-    niceConsoleAndAutologin.services.kmscon = {
-      enable = true;
-      autologinUser = "root";
-      fonts = [
-        {
-          name = "Fira Code";
-          package = pkgs.fira-code;
-        }
-      ];
-    };
-  in {
-    server = niceConsoleAndAutologin;
-  };
 }
diff --git a/projects/default.nix b/projects/default.nix
@@ -28,10 +28,39 @@
     then assert elem name allowedFiles; false
     else true;
 
+  nixosTest = test: let
+    tools = {pkgs, ...}: {
+      environment.systemPackages = with pkgs; [vim tmux jq];
+    };
+
+    # Use kmscon <https://www.freedesktop.org/wiki/Software/kmscon/>
+    # to provide a slightly nicer console, and while we're at it,
+    # also use a nice font.
+    # With kmscon, we can for example zoom in/out using [Ctrl] + [+]
+    # and [Ctrl] + [-]
+    niceConsoleAndAutologin = {pkgs, ...}: {
+      services.kmscon = {
+        enable = true;
+        autologinUser = "root";
+        fonts = [
+          {
+            name = "Fira Code";
+            package = pkgs.fira-code;
+          }
+        ];
+      };
+    };
+  in
+    pkgs.nixosTest ({
+        # NOTE: Below configuration is for "interactive" (=developing/debugging) only.
+        interactive.nodes = mapAttrs (_: _: {imports = [niceConsoleAndAutologin tools];}) test.nodes;
+      }
+      // test);
+
   hydrate = project:
     recursiveUpdate
     project
-    {nixos.tests = mapAttrs (_: pkgs.nixosTest) project.nixos.tests or {};};
+    {nixos.tests = mapAttrs (_: nixosTest) project.nixos.tests or {};};
 in
   mapAttrs (
     name: type: let