From ab4f190f41d7ca19f73e3994fd3b65f2897f30d3 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Fri, 10 Aug 2018 14:32:28 -0400 Subject: Force cgroupfs for python tests Signed-off-by: Matthew Heon --- contrib/python/podman/test/test_runner.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'contrib') diff --git a/contrib/python/podman/test/test_runner.sh b/contrib/python/podman/test/test_runner.sh index 4afbc260f..c37d9cf6e 100755 --- a/contrib/python/podman/test/test_runner.sh +++ b/contrib/python/podman/test/test_runner.sh @@ -111,6 +111,7 @@ PODMAN_ARGS="--storage-driver=vfs \ --root=${TMPDIR}/crio \ --runroot=${TMPDIR}/crio-run \ --cni-config-dir=$CNI_CONFIG_PATH \ + --cgroup-manager=cgroupfs \ " if [[ -n $VERBOSE ]]; then PODMAN_ARGS="$PODMAN_ARGS --log-level=$LOG_LEVEL" -- cgit v1.2.3-54-g00ecf From f4d124da9384c71f412141c9e9edcca9f6e2b7e9 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Fri, 10 Aug 2018 15:48:35 -0400 Subject: Fix python tests to use cgroupfs Signed-off-by: Matthew Heon --- contrib/python/podman/test/podman_testcase.py | 1 + 1 file changed, 1 insertion(+) (limited to 'contrib') diff --git a/contrib/python/podman/test/podman_testcase.py b/contrib/python/podman/test/podman_testcase.py index f96a3a013..f5a01c98f 100644 --- a/contrib/python/podman/test/podman_testcase.py +++ b/contrib/python/podman/test/podman_testcase.py @@ -39,6 +39,7 @@ class PodmanTestCase(unittest.TestCase): tmpdir = os.environ.get('TMPDIR', '/tmp') podman_args = [ '--storage-driver=vfs', + '--cgroup-manager=systemd', '--root={}/crio'.format(tmpdir), '--runroot={}/crio-run'.format(tmpdir), '--cni-config-dir={}/cni/net.d'.format(tmpdir), -- cgit v1.2.3-54-g00ecf From 9c42e84173a3cc8c957b430259c0303275b34e58 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Fri, 10 Aug 2018 16:18:44 -0400 Subject: Fix python tests again Signed-off-by: Matthew Heon --- contrib/python/podman/test/podman_testcase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/python/podman/test/podman_testcase.py b/contrib/python/podman/test/podman_testcase.py index f5a01c98f..731fa26fc 100644 --- a/contrib/python/podman/test/podman_testcase.py +++ b/contrib/python/podman/test/podman_testcase.py @@ -39,7 +39,7 @@ class PodmanTestCase(unittest.TestCase): tmpdir = os.environ.get('TMPDIR', '/tmp') podman_args = [ '--storage-driver=vfs', - '--cgroup-manager=systemd', + '--cgroup-manager=cgroupfs', '--root={}/crio'.format(tmpdir), '--runroot={}/crio-run'.format(tmpdir), '--cni-config-dir={}/cni/net.d'.format(tmpdir), -- cgit v1.2.3-54-g00ecf