containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cirrus: Remove unnecessary handle_crun workaround 

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich 2020-02-27 12:09:52 -05:00
parent e874b5b222
commit c96eb612e5
No known key found for this signature in database
GPG Key ID: 03EDC70FD578067F
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/cirrus/integration_test.sh
View File

@ -16,16 +16,6 @@ fi
cd "$GOSRC" 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 case "$SPECIALMODE" in
in_podman) in_podman)
${CONTAINER_RUNTIME} run --rm --privileged --net=host \ ${CONTAINER_RUNTIME} run --rm --privileged --net=host \
@ -49,7 +39,6 @@ case "$SPECIALMODE" in
endpoint) endpoint)
make make
make install PREFIX=/usr ETCDIR=/etc make install PREFIX=/usr ETCDIR=/etc
#handle_crun
make test-binaries make test-binaries
make endpoint make endpoint
;; ;;
@ -63,7 +52,6 @@ case "$SPECIALMODE" in
make install PREFIX=/usr ETCDIR=/etc make install PREFIX=/usr ETCDIR=/etc
make install.config PREFIX=/usr make install.config PREFIX=/usr
make test-binaries make test-binaries
handle_crun
if [[ "$TEST_REMOTE_CLIENT" == "true" ]] if [[ "$TEST_REMOTE_CLIENT" == "true" ]]
then then
make remote${TESTSUITE} VARLINK_LOG=$VARLINK_LOG make remote${TESTSUITE} VARLINK_LOG=$VARLINK_LOG