diff options
| author | Brent Baude <bbaude@redhat.com> | 2020-08-31 14:04:05 -0500 |
|---|---|---|
| committer | Brent Baude <bbaude@redhat.com> | 2020-08-31 16:40:22 -0500 |
| commit | 053cbd5e0c07d9ec86c5e47dc924a2eb2dc1dc01 (patch) | |
| tree | fe4eb960f644a75eeabbdcf5c7a8db69abace20f | |
| parent | 3352e8b0e6bb77344a4470ef86b2d2dc6262a668 (diff) | |
| download | podman-053cbd5e0c07d9ec86c5e47dc924a2eb2dc1dc01.tar.gz podman-053cbd5e0c07d9ec86c5e47dc924a2eb2dc1dc01.tar.bz2 podman-053cbd5e0c07d9ec86c5e47dc924a2eb2dc1dc01.zip | |
use crio runc on CICID ubuntu
when running CICD on Ubuntu where no cgroups v2, we need to use a newer runc for things like seccomp and the default ubuntu runc
is not new enough.
Signed-off-by: Brent Baude <bbaude@redhat.com>
| -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. |