summaryrefslogtreecommitdiff
path: root/contrib/cirrus/setup_environment.sh
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-07-27 20:56:17 +0200
committerGitHub <noreply@github.com>2020-07-27 20:56:17 +0200
commit956caf303a80105845b8e94b7018416abc59a474 (patch)
treee4e787beafc2a82c601cd84710f95a097c001a5b /contrib/cirrus/setup_environment.sh
parentbf92ec523494859301e6337539bc0d97e232b80a (diff)
parent9fad55c87f0ae6d2d01c77d8c67c5883ccbdbfde (diff)
downloadpodman-956caf303a80105845b8e94b7018416abc59a474.tar.gz
podman-956caf303a80105845b8e94b7018416abc59a474.tar.bz2
podman-956caf303a80105845b8e94b7018416abc59a474.zip
Merge pull request #7070 from edsantiago/ci_fixes
CI - various fixes
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
-rwxr-xr-xcontrib/cirrus/setup_environment.sh3
1 files changed, 0 insertions, 3 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index fbdae83fa..437a83c4b 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -57,9 +57,6 @@ 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