diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-26 14:55:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-26 14:55:12 +0200 |
| commit | b212daa92f3a596efa87b6ccaa097f70cd34bb10 (patch) | |
| tree | 11d945f47836e9aef2f83e2c461ff4da191b081c /contrib/cirrus/setup_environment.sh | |
| parent | eca157fb54d860215695b8e1de8a10cd1c836772 (diff) | |
| parent | ac5ad9acbf93106b39505803d9ed230c8c87fea9 (diff) | |
| download | podman-b212daa92f3a596efa87b6ccaa097f70cd34bb10.tar.gz podman-b212daa92f3a596efa87b6ccaa097f70cd34bb10.tar.bz2 podman-b212daa92f3a596efa87b6ccaa097f70cd34bb10.zip | |
Merge pull request #3632 from cevich/small_cirrus_fixes
Small cirrus and image-build fixes
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 9 |
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 |