diff options
| author | Ed Santiago <santiago@redhat.com> | 2020-09-03 11:07:15 -0600 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2020-09-03 14:08:34 -0600 |
| commit | 36caf4ee446a9f363cb76c629904e4ae165799b3 (patch) | |
| tree | 6beb0b5433f1aaad5cf22eb1cd8f56b5fb5d3f70 /contrib | |
| parent | fa487a65220951e84779f200f48780666b4b9209 (diff) | |
| download | podman-36caf4ee446a9f363cb76c629904e4ae165799b3.tar.gz podman-36caf4ee446a9f363cb76c629904e4ae165799b3.tar.bz2 podman-36caf4ee446a9f363cb76c629904e4ae165799b3.zip | |
WIP: update VM images
(This is an adoption of #7533 because Brent is on PTO).
Pick up new crun and crio-runc.
Also: renames from useful fedora-32 and -31 to less-useful
names; presumably this is needed by something-something in
the new VM setup.
Also: tweak two e2e tests to more properly handle a kernel
(5.8.4) with a greater set of capabilities than what we
or crun can yet handle.
Signed-off-by: Ed Santiago <santiago@redhat.com>
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 |