Skip to content

Commit 80dcac9

Browse files
committed
test: fix ssh key path in podman tests
in 7bb32ee the ssh key algorithm was changed to ed25519 so the resulting ssh private key is now called id_ed25519
1 parent e222fc9 commit 80dcac9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

test/e2e/testsuite/testsuite.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -940,14 +940,14 @@ func PodmanCommandIsAvailable() error {
940940

941941
// Do what 'eval $(crc podman-env) would do
942942
path := os.ExpandEnv("${HOME}/.crc/bin/podman:$PATH")
943-
csshk := os.ExpandEnv("${HOME}/.crc/machines/crc/id_ecdsa")
943+
csshk := os.ExpandEnv("${HOME}/.crc/machines/crc/id_ed25519")
944944
dh := os.ExpandEnv("unix:///${HOME}/.crc/machines/crc/docker.sock")
945945
ch := "ssh://core@127.0.0.1:2222/run/user/1000/podman/podman.sock"
946946
if runtime.GOOS == "windows" {
947947
userHomeDir, _ := os.UserHomeDir()
948948
unexpandedPath := filepath.Join(userHomeDir, ".crc/bin/podman;${PATH}")
949949
path = os.ExpandEnv(unexpandedPath)
950-
csshk = filepath.Join(userHomeDir, ".crc/machines/crc/id_ecdsa")
950+
csshk = filepath.Join(userHomeDir, ".crc/machines/crc/id_ed25519")
951951
dh = "npipe:////./pipe/crc-podman"
952952
}
953953
if runtime.GOOS == "linux" {

test/integration/podman_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ var _ = Describe("podman-remote", Serial, Ordered, Label("microshift-preset"), f
4747
It("podman-env", func() {
4848
// Do what 'eval $(crc podman-env) would do
4949
path := os.ExpandEnv("${HOME}/.crc/bin/podman:$PATH")
50-
csshk := os.ExpandEnv("${HOME}/.crc/machines/crc/id_ecdsa")
50+
csshk := os.ExpandEnv("${HOME}/.crc/machines/crc/id_ed25519")
5151
dh := os.ExpandEnv("unix:///${HOME}/.crc/machines/crc/docker.sock")
5252
ch := "ssh://core@127.0.0.1:2222/run/user/1000/podman/podman.sock"
5353
if runtime.GOOS == "windows" {
5454
userHomeDir, _ := os.UserHomeDir()
5555
unexpandedPath := filepath.Join(userHomeDir, ".crc/bin/podman;${PATH}")
5656
path = os.ExpandEnv(unexpandedPath)
57-
csshk = filepath.Join(userHomeDir, ".crc/machines/crc/id_ecdsa")
57+
csshk = filepath.Join(userHomeDir, ".crc/machines/crc/id_ed25519")
5858
dh = "npipe:////./pipe/crc-podman"
5959
}
6060
if runtime.GOOS == "linux" {

0 commit comments

Comments
 (0)