diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-10 23:13:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-10 23:13:09 +0100 |
| commit | 2790b5c69c729df7ba83b214800de387fd43c646 (patch) | |
| tree | 5889c728ecdca4f9e041ebc7104343c1263249c2 /contrib | |
| parent | 92cd152b533fc39fa698644e0fa41716e6999e52 (diff) | |
| parent | 799078216bce860ebcc239c7952ce6cd7491996b (diff) | |
| download | podman-2790b5c69c729df7ba83b214800de387fd43c646.tar.gz podman-2790b5c69c729df7ba83b214800de387fd43c646.tar.bz2 podman-2790b5c69c729df7ba83b214800de387fd43c646.zip | |
Merge pull request #12793 from cevich/vmimg_update
Enable gitlab runner unit testing + Freshen VM images w/ crun-1.4-1
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index ee80a209c..8f535c7e7 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -118,12 +118,6 @@ fi case "$OS_RELEASE_ID" in ubuntu) ;; fedora) - # Force a crun version that has this fix: https://github.com/containers/crun/pull/819 - # FIXME: Remove once a fixed crun made its way into Fedora - if test "$OS_RELEASE_VER" == "35"; then - yum upgrade -y crun - fi - if ((CONTAINER==0)); then # All SELinux distros need this for systemd-in-a-container msg "Enabling container_manage_cgroup" |