diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-02 16:41:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-02 16:41:26 -0500 |
| commit | 89f71177aa4b00ee47245787ec5b5370a500d090 (patch) | |
| tree | 2e04e1b684b7dbe3f36cbb1351afe6acd34def6a /test/e2e/libpod_suite_remote_test.go | |
| parent | b4c96535ead19e9f10d9b244c83d299cc3b1d42e (diff) | |
| parent | 7d3ad6081f6598b8fa6385409e5109f11f29254f (diff) | |
| download | podman-89f71177aa4b00ee47245787ec5b5370a500d090.tar.gz podman-89f71177aa4b00ee47245787ec5b5370a500d090.tar.bz2 podman-89f71177aa4b00ee47245787ec5b5370a500d090.zip | |
Merge pull request #12859 from baude/netavarke2e
Enable e2e tests with netavark
Diffstat (limited to 'test/e2e/libpod_suite_remote_test.go')
| -rw-r--r-- | test/e2e/libpod_suite_remote_test.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/e2e/libpod_suite_remote_test.go b/test/e2e/libpod_suite_remote_test.go index 4c5e9955f..b4a59c54d 100644 --- a/test/e2e/libpod_suite_remote_test.go +++ b/test/e2e/libpod_suite_remote_test.go @@ -153,8 +153,9 @@ func (p *PodmanTestIntegration) StopRemoteService() { // MakeOptions assembles all the podman main options func getRemoteOptions(p *PodmanTestIntegration, args []string) []string { + networkDir := p.NetworkConfigDir podmanOptions := strings.Split(fmt.Sprintf("--root %s --runroot %s --runtime %s --conmon %s --network-config-dir %s --cgroup-manager %s", - p.Root, p.RunRoot, p.OCIRuntime, p.ConmonBinary, p.CNIConfigDir, p.CgroupManager), " ") + p.Root, p.RunRoot, p.OCIRuntime, p.ConmonBinary, networkDir, p.CgroupManager), " ") if os.Getenv("HOOK_OPTION") != "" { podmanOptions = append(podmanOptions, os.Getenv("HOOK_OPTION")) } |