Skip to content

Commit 1e899de

Browse files
committed
fix tests ssh hostkeys
1 parent 8ae5e6d commit 1e899de

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

integrations/git_helper_for_declarative_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ func withKeyFile(t *testing.T, keyname string, callback func(string)) {
3838
assert.NoError(t, err)
3939

4040
err = os.WriteFile(path.Join(tmpDir, "ssh"), []byte("#!/bin/bash\n"+
41-
"ssh -o \"UserKnownHostsFile=/dev/null\" -o \"StrictHostKeyChecking=no\" -o \"IdentitiesOnly=yes\" -i \""+keyFile+"\" \"$@\""), 0o700)
41+
"ssh -o \"UserKnownHostsFile=/dev/null\" -o \"StrictHostKeyChecking=no\" -o \"HostkeyAlgorithms=+ssh-rsa\" -o \"PubkeyAcceptedAlgorithms=+ssh-rsa\" -o \"IdentitiesOnly=yes\" -i \""+keyFile+"\" \"$@\""), 0o700)
4242
assert.NoError(t, err)
4343

4444
// Setup ssh wrapper
4545
os.Setenv("GIT_SSH", path.Join(tmpDir, "ssh"))
4646
os.Setenv("GIT_SSH_COMMAND",
47-
"ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i \""+keyFile+"\"")
47+
"ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -o HostkeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa -i \""+keyFile+"\"")
4848
os.Setenv("GIT_SSH_VARIANT", "ssh")
4949

5050
callback(keyFile)

0 commit comments

Comments
 (0)