chore: simplify system manager tests

Move ubuntu docker image to its own package.
Create one test for all system modules.

Author: jfroche

nix/packages/default.nix

@@ -34,6 +34,7 @@
           ansible-test = pkgs.callPackage ./ansible-test.nix { };
           cleanup-ami = pkgs.callPackage ./cleanup-ami.nix { };
           dbmate-tool = pkgs.callPackage ./dbmate-tool.nix { inherit (self.supabase) defaults; };
+          docker-image-ubuntu = pkgs.callPackage ./docker-ubuntu.nix { };
           docs = pkgs.callPackage ./docs.nix { };
           supabase-groonga = pkgs.callPackage ./groonga { };
           local-infra-bootstrap = pkgs.callPackage ./local-infra-bootstrap.nix { };

nix/packages/docker-ubuntu.nix

@@ -0,0 +1,43 @@
+{ runCommand, dockerTools, xz, buildEnv }:
+let
+  ubuntu-cloudimg =
+    let
+      cloudImg = builtins.fetchurl {
+        url = "http://cloud-images-archive.ubuntu.com/releases/noble/release-20250430/ubuntu-24.04-server-cloudimg-amd64-root.tar.xz";
+        sha256 = "sha256:0rfi3qqs0sqarixfic7pzjpx7d4vldv2d98c5zjv7b90mirznvf9";
+      };
+    in
+    runCommand "ubuntu-cloudimg" { nativeBuildInputs = [ xz ]; } ''
+      mkdir -p $out
+      tar --exclude='dev/*' \
+          --exclude='etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service' \
+          --exclude='etc/systemd/system/multi-user.target.wants/systemd-resolved.service' \
+          --exclude='usr/lib/systemd/system/tpm-udev.service' \
+          --exclude='usr/lib/systemd/system/systemd-remount-fs.service' \
+          --exclude='usr/lib/systemd/system/systemd-resolved.service' \
+          --exclude='usr/lib/systemd/system/proc-sys-fs-binfmt_misc.automount' \
+          --exclude='usr/lib/systemd/system/sys-kernel-*' \
+          --exclude='var/lib/apt/lists/*' \
+          -xJf ${cloudImg} -C $out
+      rm $out/bin $out/lib $out/lib64 $out/sbin
+      mkdir -p $out/run/systemd && echo 'docker' > $out/run/systemd/container
+      mkdir $out/var/lib/apt/lists/partial
+    '';
+in
+dockerTools.buildImage {
+  name = "ubuntu-cloudimg";
+  tag = "24.04";
+  created = "now";
+  extraCommands = ''
+    ln -s usr/bin
+    ln -s usr/lib
+    ln -s usr/lib64
+    ln -s usr/sbin
+  '';
+  copyToRoot = buildEnv {
+    name = "image-root";
+    pathsToLink = [ "/" ];
+    paths = [ ubuntu-cloudimg ];
+  };
+  config.Cmd = [ "/lib/systemd/systemd" ];
+}

nix/systemModules/default.nix

@@ -1,14 +1,9 @@
 {
-  flake-parts-lib,
-  withSystem,
-  self,
   ...
 }:
 {
   imports = [ ./tests ];
   flake = {
-    systemModules = {
-      nginx = flake-parts-lib.importApply ./nginx.nix { inherit withSystem self; };
-    };
+    systemModules = { };
   };
 }

nix/systemModules/nginx.nix

@@ -92,7 +92,7 @@ def wait_for_target(host, target, timeout=60):
         result = host.run(f"systemctl is-active {target}")
         if result.rc == 0:
             return True
-        time.sleep(1)
+        time.sleep(0.2)
     return False
 
 

nix/systemModules/tests/conftest.py

@@ -1,10 +1,70 @@
 { self, ... }:
 {
   perSystem =
-    { lib, pkgs, ... }:
+    {
+      lib,
+      pkgs,
+      self',
+      ...
+    }:
     {
       packages = lib.optionalAttrs (pkgs.stdenv.hostPlatform.isLinux) {
-        check-system-manager-nginx = (import ./nginx.nix { inherit self pkgs; });
+        check-system-manager =
+          let
+            lib = pkgs.lib;
+            systemManagerConfig = self.inputs.system-manager.lib.makeSystemConfig {
+              modules = [
+                ({
+                  services.nginx.enable = true;
+                  nixpkgs.hostPlatform = pkgs.system;
+                })
+              ];
+            };
+
+            dockerImageUbuntuWithTools =
+              let
+                tools = [ systemManagerConfig ];
+              in
+              pkgs.dockerTools.buildLayeredImage {
+                name = "ubuntu-cloudimg-with-tools";
+                tag = "0.2";
+                created = "now";
+                maxLayers = 30;
+                fromImage = self'.packages.docker-image-ubuntu;
+                compressor = "zstd";
+                config = {
+                  Env = [
+                    "PATH=${lib.makeBinPath tools}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+                  ];
+                  Cmd = [ "/lib/systemd/systemd" ];
+                };
+              };
+          in
+          pkgs.writeShellApplication {
+            name = "system-manager-test";
+            passthru = {
+              inherit systemManagerConfig dockerImageUbuntuWithTools;
+            };
+            runtimeInputs = with pkgs; [
+              (python3.withPackages (
+                ps: with ps; [
+                  requests
+                  pytest
+                  pytest-testinfra
+                  rich
+                ]
+              ))
+            ];
+            text = ''
+              export DOCKER_IMAGE=${dockerImageUbuntuWithTools.imageName}:${dockerImageUbuntuWithTools.imageTag}
+              TEST_DIR=${./.}
+              pytest -p no:cacheprovider -s -v "$@" $TEST_DIR --image-name=$DOCKER_IMAGE --image-path=${dockerImageUbuntuWithTools}
+            '';
+            meta = with pkgs.lib; {
+              description = "Test deployment with system-manager";
+              platforms = platforms.linux;
+            };
+          };
       };
     };
 }