diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-06 16:41:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-06 16:41:11 +0100 |
commit | c0b3df805999551db1da8ec2866457c555e627c7 (patch) | |
tree | 3f141eb2e1b1c9cd474cc41b02f719655500e35b | |
parent | 755b7aa5214183a0358116e783affdc1d7dd7db4 (diff) | |
parent | 7a24be6ad952b361c7244dc2493ef08351e059c6 (diff) | |
download | podman-c0b3df805999551db1da8ec2866457c555e627c7.tar.gz podman-c0b3df805999551db1da8ec2866457c555e627c7.tar.bz2 podman-c0b3df805999551db1da8ec2866457c555e627c7.zip |
Merge pull request #12759 from rhatdan/ci
Fix CI
-rwxr-xr-x | contrib/cirrus/setup_environment.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 43c709228..ee80a209c 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -121,8 +121,9 @@ case "$OS_RELEASE_ID" in # 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 + yum upgrade -y crun fi + if ((CONTAINER==0)); then # All SELinux distros need this for systemd-in-a-container msg "Enabling container_manage_cgroup" |