containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5532 from baude/filetimeoutflake 

fix timeout file flake
This commit is contained in:
OpenShift Merge Robot 2020-03-18 16:01:31 +01:00 committed by GitHub
parent de43a00b55 d47dc63cf5
commit d9eb078e2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/cirrus/setup_environment.sh
View File

@ -47,6 +47,15 @@ case "${OS_RELEASE_ID}" in
fi fi
;; ;;
fedora) fedora)
# This is temporary and should be removed once conmon is in stable
# and the images can be rebuilt properly.
if [[ "$OS_RELEASE_VER" -eq "30" ]]; then
dnf -y install https://kojipkgs.fedoraproject.org//packages/conmon/2.0.13/1.fc30/x86_64/conmon-2.0.13-1.fc30.x86_64.rpm
else
dnf -y install https://kojipkgs.fedoraproject.org//packages/conmon/2.0.13/1.fc31/x86_64/conmon-2.0.13-1.fc31.x86_64.rpm
fi
# End of temporary patch
# All SELinux distros need this for systemd-in-a-container # All SELinux distros need this for systemd-in-a-container
setsebool container_manage_cgroup true setsebool container_manage_cgroup true
if [[ "$ADD_SECOND_PARTITION" == "true" ]]; then if [[ "$ADD_SECOND_PARTITION" == "true" ]]; then