From 0835c4ea22801e6f1fba9fb8a6ecc2cd7294cd14 Mon Sep 17 00:00:00 2001 From: devydave Date: Fri, 30 Oct 2026 00:10:09 +0100 Subject: [PATCH] fix: reproducable ssh-add --- nix/Makefile | 4 ---- nix/test_integration.sh | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/nix/Makefile b/nix/Makefile index 492b1c8b..6bbb120e 100644 --- a/nix/Makefile +++ b/nix/Makefile @@ -6,10 +6,6 @@ test-integration: test-integration-hosts: $(GIT_ROOT)/scripts/tests/extra_hosts -add_ssh_key: - chmod 600 $(GIT_ROOT)/tests/resources/local_integration_ssh - ssh-add $(GIT_ROOT)/tests/resources/local_integration_ssh - CLIENT_VM := abra-client vm-client-status: sudo systemctl status microvm@$(CLIENT_VM).service diff --git a/nix/test_integration.sh b/nix/test_integration.sh index 57c9a032..12e6226a 100755 --- a/nix/test_integration.sh +++ b/nix/test_integration.sh @@ -33,7 +33,7 @@ git restore -- "$GIT_ROOT/tests/resources/path_to_repo" read -rp "Press enter to run all tests or specify test files: " TEST_INTEGRATION_FILES # -t option is needed for stdin output that is checked in integration tests -ssh -t abra@10.0.0.2 -i "$GIT_ROOT/tests/resources/local_integration_ssh" "cd abra; make -f ./nix/Makefile add_ssh_key; make test-integration TEST_INTEGRATION_FILES=$TEST_INTEGRATION_FILES" +ssh -t abra@10.0.0.2 -i "$GIT_ROOT/tests/resources/local_integration_ssh" "cd abra; chmod 600 ./tests/resources/local_integration_ssh; ssh-add ./tests/resources/local_integration_ssh; make test-integration TEST_INTEGRATION_FILES=$TEST_INTEGRATION_FILES"