diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-12-21 17:44:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-21 17:44:20 +0100 |
| commit | d2fcfef8b07532dc7418079160f0d6b989143c25 (patch) | |
| tree | de776be51128c21c7691e24e5266a477c4bda012 | |
| parent | 253fddbdfdac0595ef1ce5ccf6bdd5fa94e5e32c (diff) | |
| parent | fca66b6cb56c4cff69e995c8076599d63d75b6a5 (diff) | |
| download | podman-d2fcfef8b07532dc7418079160f0d6b989143c25.tar.gz podman-d2fcfef8b07532dc7418079160f0d6b989143c25.tar.bz2 podman-d2fcfef8b07532dc7418079160f0d6b989143c25.zip | |
Merge pull request #12670 from giuseppe/fix-crun-ci
ci: force scratch build for crun
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 8f535c7e7..43c709228 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -118,6 +118,11 @@ 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 https://kojipkgs.fedoraproject.org//work/tasks/684/80280684/crun-1.3-2.fc35.x86_64.rpm + fi if ((CONTAINER==0)); then # All SELinux distros need this for systemd-in-a-container msg "Enabling container_manage_cgroup" |