diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-18 16:01:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-18 16:01:31 +0100 |
| commit | d9eb078e2a1cff73461f285924ab1ab8699e9bca (patch) | |
| tree | 26efa3aa1ca24d603c454f7d769a4f76b4d8db0e | |
| parent | de43a00b55bcefb508573d288c67d9317c09788e (diff) | |
| parent | d47dc63cf5b4804e5daf81f1e53d26ad7857a1e0 (diff) | |
| download | podman-d9eb078e2a1cff73461f285924ab1ab8699e9bca.tar.gz podman-d9eb078e2a1cff73461f285924ab1ab8699e9bca.tar.bz2 podman-d9eb078e2a1cff73461f285924ab1ab8699e9bca.zip | |
Merge pull request #5532 from baude/filetimeoutflake
fix timeout file flake
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 5001ef4dd..9b4a56acd 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -47,6 +47,15 @@ case "${OS_RELEASE_ID}" in fi ;; 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 setsebool container_manage_cgroup true if [[ "$ADD_SECOND_PARTITION" == "true" ]]; then |