diff options
| author | Paul Holzinger <pholzing@redhat.com> | 2022-01-18 16:17:53 +0100 |
|---|---|---|
| committer | Paul Holzinger <pholzing@redhat.com> | 2022-01-18 19:28:25 +0100 |
| commit | c0e07234631cfcea1d6724c05606964a4d833f39 (patch) | |
| tree | 57c80b1ff2804f26a0546117b01c30ffbadcbc1c /test/e2e/common_test.go | |
| parent | 55ad6188b067ba6594819c318dd2ae92dea2f27e (diff) | |
| download | podman-c0e07234631cfcea1d6724c05606964a4d833f39.tar.gz podman-c0e07234631cfcea1d6724c05606964a4d833f39.tar.bz2 podman-c0e07234631cfcea1d6724c05606964a4d833f39.zip | |
rename --cni-config-dir to --network-config-dir
Since this option will also be used for netavark we should rename it to
something more generic. It is important that --cni-config-dir still
works otherwise we could break existing container cleanup commands.
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'test/e2e/common_test.go')
| -rw-r--r-- | test/e2e/common_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 64f40d2ed..56f050665 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -817,7 +817,7 @@ 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 --cni-config-dir %s --cgroup-manager %s --tmpdir %s --events-backend %s", + 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.CNIConfigDir, p.CgroupManager, p.TmpDir, eventsType), " ") if os.Getenv("HOOK_OPTION") != "" { podmanOptions = append(podmanOptions, os.Getenv("HOOK_OPTION")) |