diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2017-11-01 15:30:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-01 15:30:35 -0400 |
| commit | d7782cc31e809d8e1551f47a0ddb0ff8073005fc (patch) | |
| tree | 625fdeaf51ffced387b4ba2e48d93288f3f1b9b2 /test/helpers.bash | |
| parent | f5019df3f5da9030ce21e5c8ad3d3921a6585e7f (diff) | |
| parent | 8cf07b2ad1ed8c6646c48a74e9ecbb2bfeecb322 (diff) | |
| download | podman-d7782cc31e809d8e1551f47a0ddb0ff8073005fc.tar.gz podman-d7782cc31e809d8e1551f47a0ddb0ff8073005fc.tar.bz2 podman-d7782cc31e809d8e1551f47a0ddb0ff8073005fc.zip | |
Merge pull request #2 from baude/create
libpod create and run
Diffstat (limited to 'test/helpers.bash')
| -rw-r--r-- | test/helpers.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/helpers.bash b/test/helpers.bash index 428336268..dee2193d3 100644 --- a/test/helpers.bash +++ b/test/helpers.bash @@ -90,7 +90,7 @@ CRIO_CNI_PLUGIN=${CRIO_CNI_PLUGIN:-/opt/cni/bin/} POD_CIDR="10.88.0.0/16" POD_CIDR_MASK="10.88.*.*" -KPOD_OPTIONS="--root $TESTDIR/crio $STORAGE_OPTIONS --runroot $TESTDIR/crio-run --runtime ${RUNTIME_BINARY}" +KPOD_OPTIONS="--root $TESTDIR/crio $STORAGE_OPTIONS --runroot $TESTDIR/crio-run --runtime ${RUNTIME_BINARY} --conmon ${CONMON_BINARY}" cp "$CONMON_BINARY" "$TESTDIR/conmon" |