diff options
Diffstat (limited to '')
| -rw-r--r-- | tests/by-name/at/atuin-sync/test.nix | 7 | ||||
| -rw-r--r-- | tests/by-name/ba/back/test.nix | 7 | ||||
| -rw-r--r-- | tests/by-name/gi/git-server/test.nix | 7 | ||||
| -rw-r--r-- | tests/by-name/mo/monitoring-basic/test.nix | 7 | ||||
| -rw-r--r-- | tests/by-name/mo/monitoring-federation/test.nix | 19 | ||||
| -rw-r--r-- | tests/by-name/ro/rocie/test.nix | 12 | ||||
| -rw-r--r-- | tests/by-name/ru/rust-motd/test.nix | 12 | ||||
| -rw-r--r-- | tests/by-name/sh/sharkey-cpu/test.nix | 7 | ||||
| -rw-r--r-- | tests/by-name/sh/sharkey/test.nix | 12 |
9 files changed, 3 insertions, 87 deletions
diff --git a/tests/by-name/at/atuin-sync/test.nix b/tests/by-name/at/atuin-sync/test.nix index cf8f0d8..3b8f1de 100644 --- a/tests/by-name/at/atuin-sync/test.nix +++ b/tests/by-name/at/atuin-sync/test.nix @@ -1,6 +1,5 @@ { pkgs, - extraModules, turtle, vhack, ... @@ -18,12 +17,6 @@ vhack.runTest { atuin = turtle.packages."${pkgs.stdenv.hostPlatform.system}".default; in { server = {config, ...}: { - imports = - extraModules - ++ [ - ../../../../modules - ]; - vhack = { persist.enable = true; nginx.enable = true; diff --git a/tests/by-name/ba/back/test.nix b/tests/by-name/ba/back/test.nix index b1d908d..758980e 100644 --- a/tests/by-name/ba/back/test.nix +++ b/tests/by-name/ba/back/test.nix @@ -1,6 +1,5 @@ { pkgs, - extraModules, vhack, ... }: let @@ -32,12 +31,6 @@ in server = {config, ...}: { environment.systemPackages = [pkgs.git]; - imports = - extraModules - ++ [ - ../../../../modules - ]; - vhack = { persist.enable = true; openssh.enable = true; diff --git a/tests/by-name/gi/git-server/test.nix b/tests/by-name/gi/git-server/test.nix index b374eb2..09e559c 100644 --- a/tests/by-name/gi/git-server/test.nix +++ b/tests/by-name/gi/git-server/test.nix @@ -1,6 +1,5 @@ { pkgs, - extraModules, vhack, ... }: let @@ -45,12 +44,6 @@ in nodes = { server = {config, ...}: { - imports = - extraModules - ++ [ - ../../../../modules - ]; - vhack = { persist.enable = true; openssh.enable = true; diff --git a/tests/by-name/mo/monitoring-basic/test.nix b/tests/by-name/mo/monitoring-basic/test.nix index a4d67a9..ce225ce 100644 --- a/tests/by-name/mo/monitoring-basic/test.nix +++ b/tests/by-name/mo/monitoring-basic/test.nix @@ -1,5 +1,4 @@ { - extraModules, vhack, ... }: let @@ -16,12 +15,6 @@ in client = {}; server = {config, ...}: { - imports = - extraModules - ++ [ - ../../../../modules - ]; - # there are no SMART available disk in the VM, so this service always fails. systemd.services."smartd".enable = false; diff --git a/tests/by-name/mo/monitoring-federation/test.nix b/tests/by-name/mo/monitoring-federation/test.nix index 106bc20..278626f 100644 --- a/tests/by-name/mo/monitoring-federation/test.nix +++ b/tests/by-name/mo/monitoring-federation/test.nix @@ -1,5 +1,4 @@ { - extraModules, pkgs, vhack, ... @@ -19,12 +18,6 @@ in nodes = { server2 = {config, ...}: { - imports = - extraModules - ++ [ - ../../../../modules - ]; - environment.systemPackages = [ pkgs.curl ]; @@ -40,12 +33,6 @@ in }; }; server3 = {config, ...}: { - imports = - extraModules - ++ [ - ../../../../modules - ]; - vhack = { monitoring = { prometheus = { @@ -57,12 +44,6 @@ in }; }; server4 = {config, ...}: { - imports = - extraModules - ++ [ - ../../../../modules - ]; - vhack = { monitoring = { prometheus = { diff --git a/tests/by-name/ro/rocie/test.nix b/tests/by-name/ro/rocie/test.nix index 1f0fccb..e869a48 100644 --- a/tests/by-name/ro/rocie/test.nix +++ b/tests/by-name/ro/rocie/test.nix @@ -1,8 +1,4 @@ -{ - extraModules, - vhack, - ... -}: +{vhack, ...}: vhack.runTest { name = "rocie"; @@ -12,12 +8,6 @@ vhack.runTest { nodes = { server = {config, ...}: { - imports = - extraModules - ++ [ - ../../../../modules - ]; - age.identityPaths = ["${../../../common/email/hostKey}"]; vhack = { diff --git a/tests/by-name/ru/rust-motd/test.nix b/tests/by-name/ru/rust-motd/test.nix index 43a905d..960c6a7 100644 --- a/tests/by-name/ru/rust-motd/test.nix +++ b/tests/by-name/ru/rust-motd/test.nix @@ -1,19 +1,9 @@ -{ - extraModules, - vhack, - ... -}: +{vhack, ...}: vhack.runTest { name = "rust-motd"; nodes = { server = {config, ...}: { - imports = - extraModules - ++ [ - ../../../../modules - ]; - vhack = { rust-motd.enable = true; }; diff --git a/tests/by-name/sh/sharkey-cpu/test.nix b/tests/by-name/sh/sharkey-cpu/test.nix index d648429..b013a17 100644 --- a/tests/by-name/sh/sharkey-cpu/test.nix +++ b/tests/by-name/sh/sharkey-cpu/test.nix @@ -1,6 +1,5 @@ { pkgs, - extraModules, vhack, ... }: @@ -9,12 +8,6 @@ vhack.runTest { nodes = { server = {config, ...}: { - imports = - extraModules - ++ [ - ../../../../modules - ]; - vhack = { persist.enable = true; nginx.enable = true; diff --git a/tests/by-name/sh/sharkey/test.nix b/tests/by-name/sh/sharkey/test.nix index 7b6f537..0080520 100644 --- a/tests/by-name/sh/sharkey/test.nix +++ b/tests/by-name/sh/sharkey/test.nix @@ -1,8 +1,4 @@ -{ - extraModules, - vhack, - ... -}: +{vhack, ...}: vhack.runTest { name = "sharkey"; @@ -12,12 +8,6 @@ vhack.runTest { nodes = { server = {config, ...}: { - imports = - extraModules - ++ [ - ../../../../modules - ]; - vhack = { persist.enable = true; nginx.enable = true; |