summaryrefslogtreecommitdiff
path: root/contrib/cirrus
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-08-16 13:20:30 +0200
committerGitHub <noreply@github.com>2019-08-16 13:20:30 +0200
commit2d47f1ae5425faa6800606092e997bd565dc3a1c (patch)
treea661269aa2cf5342247062424b11edf5353e274d /contrib/cirrus
parent14e0b40379a5446fce1f63140dd0e44a0a3e15ec (diff)
parenta3fd890b8628121b2912398d156a844e9c440ff2 (diff)
downloadpodman-2d47f1ae5425faa6800606092e997bd565dc3a1c.tar.gz
podman-2d47f1ae5425faa6800606092e997bd565dc3a1c.tar.bz2
podman-2d47f1ae5425faa6800606092e997bd565dc3a1c.zip
Merge pull request #3796 from giuseppe/enable-cgroupsv2-crun
cirrus: enable cgroups v2 tests with crun
Diffstat (limited to 'contrib/cirrus')
-rwxr-xr-xcontrib/cirrus/integration_test.sh9
1 files changed, 7 insertions, 2 deletions
diff --git a/contrib/cirrus/integration_test.sh b/contrib/cirrus/integration_test.sh
index 8a43176e4..e5de518fa 100755
--- a/contrib/cirrus/integration_test.sh
+++ b/contrib/cirrus/integration_test.sh
@@ -37,11 +37,16 @@ case "$SPECIALMODE" in
-o CheckHostIP=no $GOSRC/$SCRIPT_BASE/rootless_test.sh ${TESTSUITE}
;;
cgroupv2)
+ # FIXME: use the package once all the fixes are in a release
+ # yum install -y crun
+ setenforce 0
+ yum builddep -y crun
+ (git clone --depth=1 https://github.com/containers/crun && cd crun && ./autogen.sh && ./configure --prefix=/usr && make -j4 && make install)
+ export OCI_RUNTIME=/usr/bin/crun
make
make install PREFIX=/usr ETCDIR=/etc
make test-binaries
- echo "WARNING: Integration tests not yet ready for cgroups V2"
- #TODO: make local${TESTSUITE}
+ make local${TESTSUITE}
;;
none)
make