Merge pull request 'clanServices: Move admin test to appropriate location' (#3905) from ke-move-admin-check into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3905

checks/flake-module.nix

@@ -51,7 +51,6 @@ in
               postgresql = self.clanLib.test.containerTest ./postgresql nixosTestArgs;
 
               dummy-inventory-test = import ./dummy-inventory-test nixosTestArgs;
-              admin = import ./admin nixosTestArgs;
               borgbackup = import ./borgbackup nixosTestArgs;
               data-mesher = import ./data-mesher nixosTestArgs;
               syncthing = import ./syncthing nixosTestArgs;

clanServices/admin/flake-module.nix

@@ -1,6 +1,17 @@
-{ lib, ... }:
+{ lib, self, ... }:
 {
   clan.modules = {
     admin = lib.modules.importApply ./default.nix { };
   };
+  perSystem =
+    { pkgs, ... }:
+    {
+      checks = lib.optionalAttrs (pkgs.stdenv.isLinux) {
+        admin = import ./tests/vm/default.nix {
+          inherit pkgs;
+          clan-core = self;
+          nixosLib = import (self.inputs.nixpkgs + "/nixos/lib") { };
+        };
+      };
+    };
 }

clanServices/admin/tests/vm/default.nix

@@ -21,7 +21,7 @@ nixosLib.runTest (
 
     clan = {
       directory = ./.;
-      modules."@clan/admin" = ../../clanServices/admin/default.nix;
+      modules."@clan/admin" = ../../default.nix;
       inventory = {
 
         machines.client = { };