diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-21 17:27:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-21 17:27:04 -0400 |
| commit | d5f568efe37bbfdbca4b5e36afb7568c7eac3740 (patch) | |
| tree | a0a85c54cb96456ded30ffb798040428787f0e22 /test/e2e/common_test.go | |
| parent | bfd617ebbe622e7147d0ff44c3a1089ee15eb7f4 (diff) | |
| parent | c67d6a52c42c97b6b8f127eb66f21871058e36fa (diff) | |
| download | podman-d5f568efe37bbfdbca4b5e36afb7568c7eac3740.tar.gz podman-d5f568efe37bbfdbca4b5e36afb7568c7eac3740.tar.bz2 podman-d5f568efe37bbfdbca4b5e36afb7568c7eac3740.zip | |
Merge pull request #13957 from cevich/fix_remote_netavark
Fix using --network-backend on podman-remote
Diffstat (limited to 'test/e2e/common_test.go')
| -rw-r--r-- | test/e2e/common_test.go | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 9580230b5..2f4146bba 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -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 { |