diff options
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index eeae96469..e22f92a5b 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -67,8 +67,14 @@ source "$SCRIPT_BASE/lib.sh" case "$CG_FS_TYPE" in tmpfs) 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" | \ tee -a /etc/environment) && eval "$X" && echo "$X" + fi ;; cgroup2fs) # This is necessary since we've built/installed from source, which uses runc as the default. |