Merge pull request 'clanServices: Move service tests to appropriate locations' (#3909) from ke-move-service-checks-to-service into main

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

checks/flake-module.nix

@@ -54,9 +54,6 @@ in
               borgbackup = import ./borgbackup nixosTestArgs;
               data-mesher = import ./data-mesher nixosTestArgs;
               syncthing = import ./syncthing nixosTestArgs;
-              deltachat = import ./deltachat nixosTestArgs;
-              ergochat = import ./ergochat nixosTestArgs;
-              heisenbridge = import ./heisenbridge nixosTestArgs;
             }
             // lib.optionalAttrs (pkgs.stdenv.hostPlatform.system == "aarch64-linux") {
               # for some reason this hangs in an odd place in CI, but it works on my machine ...

clanServices/deltachat/flake-module.nix

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

clanServices/deltachat/tests/vm/default.nix

@@ -17,7 +17,7 @@ nixosLib.runTest (
 
     clan = {
       directory = ./.;
-      modules."@clan/deltachat" = ../../clanServices/deltachat/default.nix;
+      modules."@clan/deltachat" = ../../default.nix;
       inventory = {
         machines.server = { };
 

clanServices/ergochat/flake-module.nix

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

clanServices/ergochat/tests/vm/default.nix

@@ -16,7 +16,7 @@ nixosLib.runTest (
 
     clan = {
       directory = ./.;
-      modules."@clan/ergochat" = ../../clanServices/ergochat/default.nix;
+      modules."@clan/ergochat" = ../../default.nix;
       inventory = {
         machines.server = { };
 

clanServices/heisenbridge/flake-module.nix

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

clanServices/heisenbridge/tests/vm/default.nix

@@ -18,7 +18,7 @@ nixosLib.runTest (
 
     clan = {
       directory = ./.;
-      modules."@clan/heisenbridge" = ../../clanServices/heisenbridge/default.nix;
+      modules."@clan/heisenbridge" = ../../default.nix;
       inventory = {
         machines.server = { };