summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Baude <bbaude@redhat.com>2020-03-17 15:44:39 -0500
committerBrent Baude <bbaude@redhat.com>2020-03-17 15:44:39 -0500
commit14186ca28e01a35937eeb61e7168eb8e3161b507 (patch)
tree1b60ecd4cd2ced05c55ac9603d17a41ebea8b8a0
parentbcdcfeb3e35ca81e3802a2455e08296d3f894d20 (diff)
downloadpodman-14186ca28e01a35937eeb61e7168eb8e3161b507.tar.gz
podman-14186ca28e01a35937eeb61e7168eb8e3161b507.tar.bz2
podman-14186ca28e01a35937eeb61e7168eb8e3161b507.zip
fix timeout file flake
this is a temporary fix for the flake that has been troubling us. once conmon is in fedora 30 and 31 stable, we can remove this fix. the images will just need to be rebuilt. Signed-off-by: Brent Baude <bbaude@redhat.com>
-rwxr-xr-xcontrib/cirrus/setup_environment.sh9
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