kiara/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

ensure path availability in deployments

Browse source 
Signed-off-by: Kiara Grouwstra <kiara@procolix.eu>
This commit is contained in:
Kiara Grouwstra 2025-09-03 17:14:38 +02:00
parent 0f7433abde
commit 4ef3ad467d
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
3 changed files with 39 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
deployment/check/data-model-ssh/nixosTest.nix
View file

@ -39,10 +39,9 @@ in
];
nodes.deployer =
{ pkgs, ... }:
{ ... }:
{
environment.systemPackages = with pkgs; [
jq
environment.systemPackages = [
deploy
];

10
deployment/check/data-model-tf/nixosTest.nix
View file

@ -31,11 +31,9 @@ in
];
nodes.deployer =
{ pkgs, ... }:
{ ... }:
{
environment.systemPackages = with pkgs; [
(pkgs.callPackage ../../run/tf-single-host/tf.nix { })
jq
environment.systemPackages = [
deploy
];
@ -50,10 +48,10 @@ in
};
extraTestScript = ''
with subtest("ssh: Check the status before deployment"):
with subtest("Check the status before deployment"):
target.fail("hello 1>&2")
with subtest("ssh: Run the deployment"):
with subtest("Run the deployment"):
deployer.succeed("""
${lib.getExe deploy}
""")

42
deployment/data-model.nix
View file

@ -3,6 +3,7 @@
config,
inputs,
pkgs,
sources ? import ../npins,
...
}:
let
@ -146,11 +147,22 @@ let
deployment_type = "ssh-host";
};
in
pkgs.writeShellScriptBin "deploy-ssh.sh" ''
env ${
toString (lib.mapAttrsToList (k: v: "${k}=\"${toBash v}\"") environment)
} bash ./deployment/run/ssh-single-host/run.sh
'';
pkgs.writers.writeBashBin "deploy-sh.sh"
{
makeWrapperArgs = [
"--prefix"
"PATH"
":"
"${lib.makeBinPath [
pkgs.jq
]}"
];
}
''
env ${
toString (lib.mapAttrsToList (k: v: "${k}=\"${toBash v}\"") environment)
} bash ./deployment/run/ssh-single-host/run.sh
'';
};
};
});
@ -221,10 +233,22 @@ let
};
tf-env = pkgs.callPackage ./run/tf-single-host/tf-env.nix { };
in
pkgs.writeShellScriptBin "deploy-ssh.sh" ''
env ${toString (lib.mapAttrsToList (k: v: "TF_VAR_${k}=\"${toBash v}\"") environment)} \
tf_env=${tf-env} bash ./deployment/run/tf-single-host/run.sh
'';
pkgs.writers.writeBashBin "deploy-tf.sh"
{
makeWrapperArgs = [
"--prefix"
"PATH"
":"
"${lib.makeBinPath [
pkgs.jq
(pkgs.callPackage ./run/tf-single-host/tf.nix { inherit sources; })
]}"
];
}
''
env ${toString (lib.mapAttrsToList (k: v: "TF_VAR_${k}=\"${toBash v}\"") environment)} \
tf_env=${tf-env} bash ./deployment/run/tf-single-host/run.sh
'';
};
};
});