From 6e35886dc25e90310dc53001d588b4bc339944ef Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 17 Sep 2019 14:59:50 +0200 Subject: tests: use crun package Signed-off-by: Giuseppe Scrivano --- .cirrus.yml | 2 -- contrib/cirrus/integration_test.sh | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 39275f6db..70f65436e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -374,8 +374,6 @@ testing_crun_task: networking_script: '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/networking.sh' setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}' install_crun_script: 'dnf install -y crun' - # FIXME: use the package once all the fixes are in a release - override_crun_script: '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) && rm -rf crun' unit_test_script: '$SCRIPT_BASE/unit_test.sh |& ${TIMESTAMP}' integration_test_script: '$SCRIPT_BASE/integration_test.sh |& ${TIMESTAMP}' system_test_script: '$SCRIPT_BASE/system_test.sh |& ${TIMESTAMP}' diff --git a/contrib/cirrus/integration_test.sh b/contrib/cirrus/integration_test.sh index 00c3b0ec3..110066ea7 100755 --- a/contrib/cirrus/integration_test.sh +++ b/contrib/cirrus/integration_test.sh @@ -37,11 +37,8 @@ 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) + dnf install -y crun export OCI_RUNTIME=/usr/bin/crun make make install PREFIX=/usr ETCDIR=/etc -- cgit v1.2.3-54-g00ecf