diff options
| author | Chris Evich <cevich@redhat.com> | 2020-02-27 12:09:52 -0500 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2020-02-28 09:54:36 -0500 |
| commit | c96eb612e5a1149b8b618dd87c1f81d3c4878e09 (patch) | |
| tree | 021e0ad6a550a4c710a6f8fad6209f946907f4f9 | |
| parent | e874b5b222cd764b7a0716408f16bb57934e071b (diff) | |
| download | podman-c96eb612e5a1149b8b618dd87c1f81d3c4878e09.tar.gz podman-c96eb612e5a1149b8b618dd87c1f81d3c4878e09.tar.bz2 podman-c96eb612e5a1149b8b618dd87c1f81d3c4878e09.zip | |
Cirrus: Remove unnecessary handle_crun workaround
Signed-off-by: Chris Evich <cevich@redhat.com>
| -rwxr-xr-x | contrib/cirrus/integration_test.sh | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/contrib/cirrus/integration_test.sh b/contrib/cirrus/integration_test.sh index d5e6ec884..20e067c93 100755 --- a/contrib/cirrus/integration_test.sh +++ b/contrib/cirrus/integration_test.sh @@ -16,16 +16,6 @@ fi cd "$GOSRC" -# Transition workaround: runc is still the default for upstream development -handle_crun() { - # For systems with crun installed, assume CgroupsV2 and use it - if type -P crun &> /dev/null - then - warn "Replacing runc -> crun in libpod.conf" - sed -i -r -e 's/^runtime = "runc"/runtime = "crun"/' /usr/share/containers/libpod.conf - fi -} - case "$SPECIALMODE" in in_podman) ${CONTAINER_RUNTIME} run --rm --privileged --net=host \ @@ -49,7 +39,6 @@ case "$SPECIALMODE" in endpoint) make make install PREFIX=/usr ETCDIR=/etc - #handle_crun make test-binaries make endpoint ;; @@ -63,7 +52,6 @@ case "$SPECIALMODE" in make install PREFIX=/usr ETCDIR=/etc make install.config PREFIX=/usr make test-binaries - handle_crun if [[ "$TEST_REMOTE_CLIENT" == "true" ]] then make remote${TESTSUITE} VARLINK_LOG=$VARLINK_LOG |