diff options
| author | Chris Evich <cevich@redhat.com> | 2022-01-10 14:25:42 -0500 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2022-01-10 14:50:17 -0500 |
| commit | 799078216bce860ebcc239c7952ce6cd7491996b (patch) | |
| tree | 52b63374b252a4b8f9bfa8e173f540cf73c7c223 | |
| parent | 0e4e5cf99083ac7ee3f59a0f689d58423cb172c5 (diff) | |
| download | podman-799078216bce860ebcc239c7952ce6cd7491996b.tar.gz podman-799078216bce860ebcc239c7952ce6cd7491996b.tar.bz2 podman-799078216bce860ebcc239c7952ce6cd7491996b.zip | |
Cirrus: Freshen VM images
Specifically, this brings in `crun 1.4-1` allowing removal of a
temporary workaround. Ref:
https://github.com/containers/podman/pull/12759
Signed-off-by: Chris Evich <cevich@redhat.com>
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 5bb8b17fc..c33ed9c0c 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -29,7 +29,7 @@ env: UBUNTU_NAME: "ubuntu-2110" # Google-cloud VM Images - IMAGE_SUFFIX: "c6015869890330624" + IMAGE_SUFFIX: "c6454758209748992" FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}" UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}" 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" |