diff options
| author | Paul Holzinger <pholzing@redhat.com> | 2022-07-22 15:29:18 +0200 |
|---|---|---|
| committer | Paul Holzinger <pholzing@redhat.com> | 2022-07-22 15:29:18 +0200 |
| commit | 290116bf81a0ef68d1fcfe39ea3c3aeb2b3de008 (patch) | |
| tree | 0361b654fab1e499a6279978565a28c182cfc86c /test/e2e/common_test.go | |
| parent | 99bf6f96cd93867813e72742c484ab0abf15cca4 (diff) | |
| download | podman-290116bf81a0ef68d1fcfe39ea3c3aeb2b3de008.tar.gz podman-290116bf81a0ef68d1fcfe39ea3c3aeb2b3de008.tar.bz2 podman-290116bf81a0ef68d1fcfe39ea3c3aeb2b3de008.zip | |
integration test: fix network backend option with remote
I honestly do not understand all this extra option parsing here but
there is really no reason to exclude the option for remote, all the
other global options are also set there.
This fixes a problem with mixed cni/netavark use because the option was
unset.
Fixes #15017
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
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 { |