diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-01 06:13:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-01 06:13:31 -0400 |
| commit | a867b16f0c0f11fbf0bf6e8e7d32797f1b1b3744 (patch) | |
| tree | 40a4f9b460572395fcf4c660b480987f3bb65de0 | |
| parent | 557cf94d855b4ad50cea1bbc41f2491e7ec3eb8b (diff) | |
| parent | 053cbd5e0c07d9ec86c5e47dc924a2eb2dc1dc01 (diff) | |
| download | podman-a867b16f0c0f11fbf0bf6e8e7d32797f1b1b3744.tar.gz podman-a867b16f0c0f11fbf0bf6e8e7d32797f1b1b3744.tar.bz2 podman-a867b16f0c0f11fbf0bf6e8e7d32797f1b1b3744.zip | |
Merge pull request #7517 from baude/criorunc
use crio runc on CICID ubuntu
| -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. |