diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-06-21 09:53:29 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-06-22 13:19:08 +0000 |
| commit | 2c81a756e310d59702b52ffc30d84aa9e11a8dbd (patch) | |
| tree | dccca49fc4638f9739a0baf2682808b15aa51bb4 /.papr_prepare.sh | |
| parent | 4ad7e7368140f4677f8919f647cd5d6951d7e60e (diff) | |
| download | podman-2c81a756e310d59702b52ffc30d84aa9e11a8dbd.tar.gz podman-2c81a756e310d59702b52ffc30d84aa9e11a8dbd.tar.bz2 podman-2c81a756e310d59702b52ffc30d84aa9e11a8dbd.zip | |
Update the version of conmon used in test
Also start using podmin in /usr/libexec/podman rather then crio.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #979
Approved by: baude
Diffstat (limited to '.papr_prepare.sh')
| -rw-r--r-- | .papr_prepare.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.papr_prepare.sh b/.papr_prepare.sh index 24f55c5b1..8b9679a26 100644 --- a/.papr_prepare.sh +++ b/.papr_prepare.sh @@ -14,4 +14,4 @@ fi ${CONTAINER_RUNTIME} build -t ${IMAGE} -f Dockerfile.${DIST} . 2>build.log # Run the tests -${CONTAINER_RUNTIME} run --rm --privileged --net=host -v $PWD:/go/src/github.com/projectatomic/libpod --workdir /go/src/github.com/projectatomic/libpod -e PYTHON=$PYTHON -e STORAGE_OPTIONS="--storage-driver=vfs" -e CRIO_ROOT="/go/src/github.com/projectatomic/libpod" -e PODMAN_BINARY="/usr/bin/podman" -e CONMON_BINARY="/usr/libexec/crio/conmon" -e DIST=$DIST $IMAGE sh .papr.sh +${CONTAINER_RUNTIME} run --rm --privileged --net=host -v $PWD:/go/src/github.com/projectatomic/libpod --workdir /go/src/github.com/projectatomic/libpod -e PYTHON=$PYTHON -e STORAGE_OPTIONS="--storage-driver=vfs" -e CRIO_ROOT="/go/src/github.com/projectatomic/libpod" -e PODMAN_BINARY="/usr/bin/podman" -e CONMON_BINARY="/usr/libexec/podman/conmon" -e DIST=$DIST $IMAGE sh .papr.sh |