From e3190cbed7a0f65b1fa5ba84b8eef14853294125 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Mon, 13 Aug 2018 15:56:16 -0400 Subject: Fix papr tests by forcing cgroupfs in CI Signed-off-by: Matthew Heon Closes: #1267 Approved by: mheon --- .papr_prepare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3-54-g00ecf