summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2019-09-17 14:59:50 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2019-09-19 13:58:56 +0200
commit6e35886dc25e90310dc53001d588b4bc339944ef (patch)
tree9feab70ad1c6a6c7948218255f7e446fba0df542
parent143caa98bf07eef1a4d46da2cc56603a3ef739b8 (diff)
downloadpodman-6e35886dc25e90310dc53001d588b4bc339944ef.tar.gz
podman-6e35886dc25e90310dc53001d588b4bc339944ef.tar.bz2
podman-6e35886dc25e90310dc53001d588b4bc339944ef.zip
tests: use crun package
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
-rw-r--r--.cirrus.yml2
-rwxr-xr-xcontrib/cirrus/integration_test.sh5
2 files changed, 1 insertions, 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