diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-08 10:40:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-08 10:40:39 -0400 |
| commit | 11679c27a7abb10811563c23b5276750c6b58f4b (patch) | |
| tree | 9ce2141a76826c0b781141f82877dde5aa419802 /contrib | |
| parent | bcb58eacfc678197a5db0ade87eab69804c731f7 (diff) | |
| parent | 36caf4ee446a9f363cb76c629904e4ae165799b3 (diff) | |
| download | podman-11679c27a7abb10811563c23b5276750c6b58f4b.tar.gz podman-11679c27a7abb10811563c23b5276750c6b58f4b.tar.bz2 podman-11679c27a7abb10811563c23b5276750c6b58f4b.zip | |
Merge pull request #7538 from edsantiago/cap_test_robust
Update VM images for new crun; adapt Cap tests to work with new kernel
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index e22f92a5b..855866477 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -68,7 +68,7 @@ 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 + 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 |