diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-09-20 09:00:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-20 09:00:22 +0200 |
| commit | 7ed1816900b9e1cc8087f8256e836eb62d0c6295 (patch) | |
| tree | d3a03c7681b245ada92f239b2121a5f9100d9dee | |
| parent | 9dc764c1976944c2e14480e6dd0a7db6ced37107 (diff) | |
| parent | 6e35886dc25e90310dc53001d588b4bc339944ef (diff) | |
| download | podman-7ed1816900b9e1cc8087f8256e836eb62d0c6295.tar.gz podman-7ed1816900b9e1cc8087f8256e836eb62d0c6295.tar.bz2 podman-7ed1816900b9e1cc8087f8256e836eb62d0c6295.zip | |
Merge pull request #4051 from giuseppe/use-crun-pkg
tests: use crun package
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rwxr-xr-x | contrib/cirrus/integration_test.sh | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 663fb91b8..461a39e4b 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 |