mirror of
https://github.com/containers/podman
synced 2024-10-21 01:34:37 +00:00
Merge pull request #13957 from cevich/fix_remote_netavark
Fix using --network-backend on podman-remote
This commit is contained in:
commit
d5f568efe3
|
@ -858,18 +858,15 @@ func (p *PodmanTestIntegration) makeOptions(args []string, noEvents, noCache boo
|
|||
eventsType = "none"
|
||||
}
|
||||
|
||||
networkBackend := p.NetworkBackend.ToString()
|
||||
networkDir := p.NetworkConfigDir
|
||||
if p.NetworkBackend == Netavark {
|
||||
networkDir = p.NetworkConfigDir
|
||||
}
|
||||
podmanOptions := strings.Split(fmt.Sprintf("%s--root %s --runroot %s --runtime %s --conmon %s --network-config-dir %s --cgroup-manager %s --tmpdir %s --events-backend %s",
|
||||
debug, p.Root, p.RunRoot, p.OCIRuntime, p.ConmonBinary, networkDir, p.CgroupManager, p.TmpDir, eventsType), " ")
|
||||
debug, p.Root, p.RunRoot, p.OCIRuntime, p.ConmonBinary, p.NetworkConfigDir, p.CgroupManager, p.TmpDir, eventsType), " ")
|
||||
if os.Getenv("HOOK_OPTION") != "" {
|
||||
podmanOptions = append(podmanOptions, os.Getenv("HOOK_OPTION"))
|
||||
}
|
||||
|
||||
podmanOptions = append(podmanOptions, "--network-backend", networkBackend)
|
||||
if !p.RemoteTest {
|
||||
podmanOptions = append(podmanOptions, "--network-backend", p.NetworkBackend.ToString())
|
||||
}
|
||||
|
||||
podmanOptions = append(podmanOptions, strings.Split(p.StorageOptions, " ")...)
|
||||
if !noCache {
|
||||
|
|
|
@ -137,6 +137,9 @@ func getRemoteOptions(p *PodmanTestIntegration, args []string) []string {
|
|||
if os.Getenv("HOOK_OPTION") != "" {
|
||||
podmanOptions = append(podmanOptions, os.Getenv("HOOK_OPTION"))
|
||||
}
|
||||
if p.NetworkBackend.ToString() == "netavark" {
|
||||
podmanOptions = append(podmanOptions, "--network-backend", "netavark")
|
||||
}
|
||||
podmanOptions = append(podmanOptions, strings.Split(p.StorageOptions, " ")...)
|
||||
podmanOptions = append(podmanOptions, args...)
|
||||
return podmanOptions
|
||||
|
|
|
@ -110,7 +110,7 @@ func (p *PodmanTest) PodmanAsUserBase(args []string, uid, gid uint32, cwd string
|
|||
}
|
||||
|
||||
runCmd := append(wrapper, podmanBinary)
|
||||
if p.NetworkBackend == Netavark {
|
||||
if !p.RemoteTest && p.NetworkBackend == Netavark {
|
||||
runCmd = append(runCmd, []string{"--network-backend", "netavark"}...)
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue