summaryrefslogtreecommitdiff
path: root/contrib/cirrus/setup_environment.sh
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2020-05-12 12:23:35 -0400
committerChris Evich <cevich@redhat.com>2020-06-09 14:47:23 -0400
commit455a94d1f932cd32dc07d9bf62131423610f8e2b (patch)
tree0387e09597aa4354cda3d2390fad254313112e1e /contrib/cirrus/setup_environment.sh
parent2869cce1d53aedfe2500f3d921fb901dd5994690 (diff)
downloadpodman-455a94d1f932cd32dc07d9bf62131423610f8e2b.tar.gz
podman-455a94d1f932cd32dc07d9bf62131423610f8e2b.tar.bz2
podman-455a94d1f932cd32dc07d9bf62131423610f8e2b.zip
Cirrus: Include packages for containers/conmon CI
This allows the containers/conmon repository to share the same VM images produced by containers/libpod. Included are several packages which are downloaded only since they might otherwise interfere with testing for some repos. This allows stable versions to be at the ready at testing runtime, avoiding any version updates surprising developers. Also, re-enable running the VM-image check test which was not working due to a logic problem in Cirrus-CI configuration. Update the neglected tests so that they pass on all distros. Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
-rwxr-xr-xcontrib/cirrus/setup_environment.sh8
1 files changed, 0 insertions, 8 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 25b7ff941..31d63677f 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -78,14 +78,6 @@ case "$CG_FS_TYPE" in
warn "Forcing testing with crun instead of runc"
X=$(echo "export OCI_RUNTIME=/usr/bin/crun" | \
tee -a /etc/environment) && eval "$X" && echo "$X"
-
- if [[ "$OS_RELEASE_ID" == "fedora" ]]; then
- warn "Upgrading to the latest crun"
- # Normally not something to do for stable testing
- # but crun is new, and late-breaking fixes may be required
- # on short notice
- dnf update -y crun containers-common
- fi
;;
*)
die 110 "Unsure how to handle cgroup filesystem type '$CG_FS_TYPE'"