Merge pull request 'installation: speed up by installing to localhost' (#3255) from flakiness into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3255
This commit is contained in:
Mic92
2025-04-09 09:58:43 +00:00
3 changed files with 114 additions and 116 deletions

View File

@@ -140,11 +140,12 @@ def generate_machine_hardware_info(opts: HardwareGenerateOptions) -> HardwareCon
if host.user != "root":
config_command.insert(0, "sudo")
deps = ["nixpkgs#openssh"]
if opts.password:
deps += ["nixpkgs#sshpass"]
cmd = nix_shell(
[
"nixpkgs#openssh",
"nixpkgs#sshpass",
],
deps,
[
*(["sshpass", "-p", opts.password] if opts.password else []),
"ssh",

View File

@@ -126,8 +126,11 @@ pythonRuntime.pkgs.buildPythonApplication {
# Define and expose the tests and checks to run in CI
passthru.tests =
(lib.mapAttrs' (n: lib.nameValuePair "clan-dep-${n}") testRuntimeDependenciesMap)
// {
{
clan-deps = pkgs.runCommand "clan-deps" { } ''
# ${builtins.toString (builtins.attrValues testRuntimeDependenciesMap)}
touch $out
'';
# disabled on macOS until we fix all remaining issues
clan-pytest-without-core =
runCommand "clan-pytest-without-core"