tests: improve testing framework for impure vm tests
Also fix computet sops secret paths for vars
This commit is contained in:
@@ -10,9 +10,10 @@ let
|
||||
|
||||
inherit (import ./funcs.nix { inherit lib; }) listVars;
|
||||
|
||||
varsDir = config.clan.core.clanDir + "/sops/vars";
|
||||
varsDirMachines = config.clan.core.clanDir + "/sops/vars/per-machine";
|
||||
varsDirShared = config.clan.core.clanDir + "/sops/vars/shared";
|
||||
|
||||
vars = listVars varsDir;
|
||||
vars = (listVars varsDirMachines) ++ (listVars varsDirShared);
|
||||
|
||||
in
|
||||
{
|
||||
@@ -33,7 +34,7 @@ in
|
||||
flip map vars (secret: {
|
||||
name = secret.id;
|
||||
value = {
|
||||
sopsFile = config.clan.core.clanDir + "/sops/vars/${secret.id}/secret";
|
||||
sopsFile = secret.sopsFile;
|
||||
format = "binary";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -23,6 +23,7 @@ rec {
|
||||
generator = generator_name;
|
||||
name = secret_name;
|
||||
id = "${machine_name}/${generator_name}/${secret_name}";
|
||||
sopsFile = "${varsDir}/${machine_name}/${generator_name}/${secret_name}/secret";
|
||||
})
|
||||
)
|
||||
);
|
||||
|
||||
@@ -39,9 +39,6 @@ let
|
||||
|
||||
boot.initrd.systemd.enable = true;
|
||||
|
||||
# currently needed for system.etc.overlay.enable
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
|
||||
boot.initrd.systemd.storePaths = [
|
||||
pkgs.util-linux
|
||||
pkgs.e2fsprogs
|
||||
|
||||
Reference in New Issue
Block a user