forked from crc-org/crc
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
Showing
2 changed files
with
4 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -940,14 +940,14 @@ func PodmanCommandIsAvailable() error { | |
|
|
||
| // Do what 'eval $(crc podman-env) would do | ||
| path := os.ExpandEnv("${HOME}/.crc/bin/podman:$PATH") | ||
| csshk := os.ExpandEnv("${HOME}/.crc/machines/crc/id_ecdsa") | ||
| csshk := os.ExpandEnv("${HOME}/.crc/machines/crc/id_ed25519") | ||
| dh := os.ExpandEnv("unix:///${HOME}/.crc/machines/crc/docker.sock") | ||
| ch := "ssh://[email protected]:2222/run/user/1000/podman/podman.sock" | ||
| if runtime.GOOS == "windows" { | ||
| userHomeDir, _ := os.UserHomeDir() | ||
| unexpandedPath := filepath.Join(userHomeDir, ".crc/bin/podman;${PATH}") | ||
| path = os.ExpandEnv(unexpandedPath) | ||
| csshk = filepath.Join(userHomeDir, ".crc/machines/crc/id_ecdsa") | ||
| csshk = filepath.Join(userHomeDir, ".crc/machines/crc/id_ed25519") | ||
| dh = "npipe:////./pipe/crc-podman" | ||
| } | ||
| if runtime.GOOS == "linux" { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -47,14 +47,14 @@ var _ = Describe("podman-remote", Serial, Ordered, Label("microshift-preset"), f | |
| It("podman-env", func() { | ||
| // Do what 'eval $(crc podman-env) would do | ||
| path := os.ExpandEnv("${HOME}/.crc/bin/podman:$PATH") | ||
| csshk := os.ExpandEnv("${HOME}/.crc/machines/crc/id_ecdsa") | ||
| csshk := os.ExpandEnv("${HOME}/.crc/machines/crc/id_ed25519") | ||
| dh := os.ExpandEnv("unix:///${HOME}/.crc/machines/crc/docker.sock") | ||
| ch := "ssh://[email protected]:2222/run/user/1000/podman/podman.sock" | ||
| if runtime.GOOS == "windows" { | ||
| userHomeDir, _ := os.UserHomeDir() | ||
| unexpandedPath := filepath.Join(userHomeDir, ".crc/bin/podman;${PATH}") | ||
| path = os.ExpandEnv(unexpandedPath) | ||
| csshk = filepath.Join(userHomeDir, ".crc/machines/crc/id_ecdsa") | ||
| csshk = filepath.Join(userHomeDir, ".crc/machines/crc/id_ed25519") | ||
| dh = "npipe:////./pipe/crc-podman" | ||
| } | ||
| if runtime.GOOS == "linux" { | ||
|
|
||