diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-28 20:31:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-28 20:31:57 +0100 |
| commit | 275e9b855dd0a384a283174912c08f3f097101b5 (patch) | |
| tree | d4033df5267c5913d644608934a0f7516c8a1805 /contrib/cirrus/integration_test.sh | |
| parent | 742093c2f27d79a76dbc45335e6f9458decff567 (diff) | |
| parent | e95c493fec5cab6e487d73649641cec0c1567d2c (diff) | |
| download | podman-275e9b855dd0a384a283174912c08f3f097101b5.tar.gz podman-275e9b855dd0a384a283174912c08f3f097101b5.tar.bz2 podman-275e9b855dd0a384a283174912c08f3f097101b5.zip | |
Merge pull request #5342 from cevich/runc_in_f30
Force using runc in F30
Diffstat (limited to 'contrib/cirrus/integration_test.sh')
| -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 |