mirror of
https://github.com/containers/podman
synced 2024-10-20 17:23:30 +00:00
Modify E2E tests to use alternate Conmon path if present
Signed-off-by: Matthew Heon <mheon@redhat.com> Closes: #474 Approved by: rhatdan
This commit is contained in:
parent
392d998143
commit
911e36dd0f
|
@ -117,6 +117,10 @@ func PodmanCreate(tempDir string) PodmanTest {
|
|||
podmanBinary = os.Getenv("PODMAN_BINARY")
|
||||
}
|
||||
conmonBinary := filepath.Join("/usr/libexec/crio/conmon")
|
||||
altConmonBinary := "/usr/libexec/podman/conmon"
|
||||
if _, err := os.Stat(altConmonBinary); err == nil {
|
||||
conmonBinary = altConmonBinary
|
||||
}
|
||||
if os.Getenv("CONMON_BINARY") != "" {
|
||||
conmonBinary = os.Getenv("CONMON_BINARY")
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue