opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 11:28:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7517 from baude/criorunc

Browse Source 
use crio runc on CICID ubuntu
This commit is contained in:
OpenShift Merge Robot
2020-09-01 06:13:31 -04:00
committed by GitHub
parent 557cf94d85 053cbd5e0c
commit a867b16f0c
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/cirrus/setup_environment.sh
View File

@ -67,8 +67,14 @@ source "$SCRIPT_BASE/lib.sh"
case "$CG_FS_TYPE" in case "$CG_FS_TYPE" in
tmpfs) tmpfs)
warn "Forcing testing with runc instead of crun" warn "Forcing testing with runc instead of crun"
# On ubuntu, the default runc is usually not new enough.
if ${OS_RELEASE_ID} == "ubuntu"; then
X=$(echo "export OCI_RUNTIME=/usr/lib/cri-o-runc/sbin/runc" | \
tee -a /etc/environment) && eval "$X" && echo "$X"
else
X=$(echo "export OCI_RUNTIME=/usr/bin/runc" | \ X=$(echo "export OCI_RUNTIME=/usr/bin/runc" | \
tee -a /etc/environment) && eval "$X" && echo "$X" tee -a /etc/environment) && eval "$X" && echo "$X"
fi
;; ;;
cgroup2fs) cgroup2fs)
# This is necessary since we've built/installed from source, which uses runc as the default. # This is necessary since we've built/installed from source, which uses runc as the default.