diff options
author | Matthew Heon <matthew.heon@gmail.com> | 2018-08-13 15:56:16 -0400 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-14 01:10:46 +0000 |
commit | e3190cbed7a0f65b1fa5ba84b8eef14853294125 (patch) | |
tree | 0937351c4e9869367fb6a70de1a83959531e6ca4 | |
parent | 3d55721fc4879cba166a9afb5acfeb8e1cdd6272 (diff) | |
download | podman-e3190cbed7a0f65b1fa5ba84b8eef14853294125.tar.gz podman-e3190cbed7a0f65b1fa5ba84b8eef14853294125.tar.bz2 podman-e3190cbed7a0f65b1fa5ba84b8eef14853294125.zip |
Fix papr tests by forcing cgroupfs in CI
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Closes: #1267
Approved by: mheon
-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 8b9679a26..177a751a8 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/podman/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 CGROUP_MANAGER=cgroupfs -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 |