summaryrefslogtreecommitdiff
path: root/contrib/cirrus/packer/fedora_packaging.sh
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2020-07-23 10:54:50 -0600
committerEd Santiago <santiago@redhat.com>2020-07-25 12:32:53 -0600
commit9fad55c87f0ae6d2d01c77d8c67c5883ccbdbfde (patch)
tree4d08733d860f9b2bee6b0de4159cfb3cffe8fc26 /contrib/cirrus/packer/fedora_packaging.sh
parent197825d2abeb3abaa0d71cb8574c036eaf211ab5 (diff)
downloadpodman-9fad55c87f0ae6d2d01c77d8c67c5883ccbdbfde.tar.gz
podman-9fad55c87f0ae6d2d01c77d8c67c5883ccbdbfde.tar.bz2
podman-9fad55c87f0ae6d2d01c77d8c67c5883ccbdbfde.zip
CI - various fixes
Primary purpose: upgrade crun to 0.14 on f31, in hopes of eliminating the 'cgroups.freeze' flake that is plaguing CI. While I'm at it: - remove a no-longer-needed dnf upgrade that was running in CI itself (not image building, in each actual CI run). The purpose was to upgrade conmon, but that was added a long time ago and the required conmon is now in stable. The effect of this dnf upgrade today was simply to cause flakes when fedora repos were offline. - remove a no-longer-needed check for varlink. - networking.sh : add a timeout! 'openssl s_client' will happily hang forever if a host is unreachable, which means we waste two hours waiting for Cirrus to time out. - timestamp.awk : include date (not just time) in START/END msgs. There are times when I'm looking at a CI log and it is ultra important to know if it is from yesterday or today. - add progress messages in some places where I've previously struggled to understand context in logs; and improve some unlikely error messages to include script name. ...then, after all that, wrote a new README about how to to all this. Hope it helps someone. Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'contrib/cirrus/packer/fedora_packaging.sh')
-rw-r--r--contrib/cirrus/packer/fedora_packaging.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/contrib/cirrus/packer/fedora_packaging.sh b/contrib/cirrus/packer/fedora_packaging.sh
index b4a3a2062..f19932a9f 100644
--- a/contrib/cirrus/packer/fedora_packaging.sh
+++ b/contrib/cirrus/packer/fedora_packaging.sh
@@ -153,6 +153,15 @@ DOWNLOAD_PACKAGES=(\
echo "Installing general build/test dependencies for Fedora '$OS_RELEASE_VER'"
$BIGTO ooe.sh $SUDO dnf install -y ${INSTALL_PACKAGES[@]}
+# AD-HOC CODE FOR SPECIAL-CASE SITUATIONS!
+# On 2020-07-23 we needed this code to upgrade crun on f31, a build
+# that is not yet in stable. Since CI:IMG PRs are a two-step process,
+# the key part is that we UN-COMMENT-THIS-OUT during the first step,
+# then re-comment it on the second (once we have the built images).
+# That way this will be dead code in future CI:IMG PRs but will
+# serve as an example for anyone in a similar future situation.
+# $BIGTO ooe.sh $SUDO dnf --enablerepo=updates-testing -y upgrade crun
+
[[ ${#REMOVE_PACKAGES[@]} -eq 0 ]] || \
$LILTO ooe.sh $SUDO dnf erase -y ${REMOVE_PACKAGES[@]}