summaryrefslogtreecommitdiff
path: root/contrib/cirrus/setup_environment.sh
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2019-07-25 11:56:59 -0400
committerChris Evich <cevich@redhat.com>2019-07-25 14:02:12 -0400
commit07b1e331c2f4abda0d06610ee56d79147de60cf3 (patch)
treedc8fdae7ffd3ff55576f7f3e0858dadd5843e07f /contrib/cirrus/setup_environment.sh
parentf55288c96f8a007a9fb2774c9f26d32f46da982a (diff)
downloadpodman-07b1e331c2f4abda0d06610ee56d79147de60cf3.tar.gz
podman-07b1e331c2f4abda0d06610ee56d79147de60cf3.tar.bz2
podman-07b1e331c2f4abda0d06610ee56d79147de60cf3.zip
Cirrus: Ubuntu: Set + Test for $RUNC_BINARY
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
-rwxr-xr-xcontrib/cirrus/setup_environment.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index e49bb98fe..2230684ac 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -34,7 +34,14 @@ done
# (see docs).
cd "${GOSRC}/"
case "${OS_REL_VER}" in
- ubuntu-18) ;;
+ ubuntu-18)
+ CRIO_RUNC_PATH="/usr/lib/cri-o-runc/sbin/runc"
+ if dpkg -L cri-o-runc | grep -m 1 -q "$CRIO_RUNC_PATH"
+ then
+ echo "Linking $CRIO_RUNC_PATH to /usr/bin/runc for ease of testing."
+ ln -f "$CRIO_RUNC_PATH" "/usr/bin/runc"
+ fi
+ ;;
fedora-30) ;;
fedora-29) ;;
centos-7) # Current VM is an image-builder-image no local podman/testing