diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-06 07:49:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-06 07:49:07 +0100 |
| commit | 314e1a9c5a2041d2263bb74f1d21aa2798154d76 (patch) | |
| tree | 86ee7a0edea81b0c1b6fb82950452d22fbf563e1 /test/e2e/libpod_suite_test.go | |
| parent | 650e242aa90fcb3f161da6e97921c606d3083215 (diff) | |
| parent | 80b75d299e68db0efb027adf389160a091cca4ba (diff) | |
| download | podman-314e1a9c5a2041d2263bb74f1d21aa2798154d76.tar.gz podman-314e1a9c5a2041d2263bb74f1d21aa2798154d76.tar.bz2 podman-314e1a9c5a2041d2263bb74f1d21aa2798154d76.zip | |
Merge pull request #2267 from giuseppe/allow-override-oci-runtime
tests: allow to override the OCI runtime
Diffstat (limited to 'test/e2e/libpod_suite_test.go')
| -rw-r--r-- | test/e2e/libpod_suite_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go index 1f218cbdf..4b4baa93c 100644 --- a/test/e2e/libpod_suite_test.go +++ b/test/e2e/libpod_suite_test.go @@ -207,7 +207,7 @@ func PodmanTestCreate(tempDir string) *PodmanTestIntegration { //MakeOptions assembles all the podman main options func (p *PodmanTestIntegration) makeOptions(args []string) []string { podmanOptions := strings.Split(fmt.Sprintf("--root %s --runroot %s --runtime %s --conmon %s --cni-config-dir %s --cgroup-manager %s", - p.CrioRoot, p.RunRoot, p.RunCBinary, p.ConmonBinary, p.CNIConfigDir, p.CgroupManager), " ") + p.CrioRoot, p.RunRoot, p.OCIRuntime, p.ConmonBinary, p.CNIConfigDir, p.CgroupManager), " ") if os.Getenv("HOOK_OPTION") != "" { podmanOptions = append(podmanOptions, os.Getenv("HOOK_OPTION")) } |