diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-27 20:56:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-27 20:56:17 +0200 |
| commit | 956caf303a80105845b8e94b7018416abc59a474 (patch) | |
| tree | e4e787beafc2a82c601cd84710f95a097c001a5b /contrib/cirrus/packer/fedora_packaging.sh | |
| parent | bf92ec523494859301e6337539bc0d97e232b80a (diff) | |
| parent | 9fad55c87f0ae6d2d01c77d8c67c5883ccbdbfde (diff) | |
| download | podman-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/packer/fedora_packaging.sh')
| -rw-r--r-- | contrib/cirrus/packer/fedora_packaging.sh | 9 |
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[@]} |