summaryrefslogtreecommitdiff
path: root/contrib/cirrus
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-06-03 00:02:20 +0200
committerGitHub <noreply@github.com>2020-06-03 00:02:20 +0200
commit26bb48951fa55924fd4cdb9b2ef72e19a471b959 (patch)
tree202118fd8fe72e215b9795cb8d1f506a69dc62cb /contrib/cirrus
parent4632a4b706e94fce7f85e53659dd04484d988ac7 (diff)
parent69020c7040415b532f4fe5aaaacdbd288a67b71e (diff)
downloadpodman-26bb48951fa55924fd4cdb9b2ef72e19a471b959.tar.gz
podman-26bb48951fa55924fd4cdb9b2ef72e19a471b959.tar.bz2
podman-26bb48951fa55924fd4cdb9b2ef72e19a471b959.zip
Merge pull request #6468 from mheon/remote_detached_exec
Enable detached exec for remote
Diffstat (limited to 'contrib/cirrus')
-rwxr-xr-xcontrib/cirrus/setup_environment.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 945b33909..25b7ff941 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -46,6 +46,9 @@ case "${OS_RELEASE_ID}" in
workaround_bfq_bug
+ # HACK: Need Conmon 2.0.17, currently in updates-testing on F31.
+ dnf update -y --enablerepo=updates-testing conmon
+
if [[ "$ADD_SECOND_PARTITION" == "true" ]]; then
bash "$SCRIPT_BASE/add_second_partition.sh"
fi