diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-07-22 19:32:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-22 19:32:58 +0200 |
| commit | 935c150ee214e689b8f25c195ecc22af12d1ddc7 (patch) | |
| tree | 8f14d8538042cd744a72417074b01d6358c7d10f /test/e2e/common_test.go | |
| parent | 94e97df47b576f14757e94a45199c220335bc3e9 (diff) | |
| parent | 290116bf81a0ef68d1fcfe39ea3c3aeb2b3de008 (diff) | |
| download | podman-935c150ee214e689b8f25c195ecc22af12d1ddc7.tar.gz podman-935c150ee214e689b8f25c195ecc22af12d1ddc7.tar.bz2 podman-935c150ee214e689b8f25c195ecc22af12d1ddc7.zip | |
Merge pull request #15042 from Luap99/int-remote-netbackend
integration test: fix network backend option with remote
Diffstat (limited to 'test/e2e/common_test.go')
| -rw-r--r-- | test/e2e/common_test.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 43367cf63..2d7c47a7f 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -856,12 +856,8 @@ func (p *PodmanTestIntegration) makeOptions(args []string, noEvents, noCache boo eventsType = "none" } - 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, p.NetworkConfigDir, p.CgroupManager, p.TmpDir, eventsType), " ") - - if !p.RemoteTest { - podmanOptions = append(podmanOptions, "--network-backend", p.NetworkBackend.ToString()) - } + podmanOptions := strings.Split(fmt.Sprintf("%s--root %s --runroot %s --runtime %s --conmon %s --network-config-dir %s --network-backend %s --cgroup-manager %s --tmpdir %s --events-backend %s", + debug, p.Root, p.RunRoot, p.OCIRuntime, p.ConmonBinary, p.NetworkConfigDir, p.NetworkBackend.ToString(), p.CgroupManager, p.TmpDir, eventsType), " ") podmanOptions = append(podmanOptions, strings.Split(p.StorageOptions, " ")...) if !noCache { |