summaryrefslogtreecommitdiff
path: root/contrib/cirrus/setup_environment.sh
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2019-04-24 11:35:42 -0400
committerChris Evich <cevich@redhat.com>2019-04-24 11:54:41 -0400
commit72007746aaa32ae0e098d62010209ebdf52bf037 (patch)
tree3eea81d38a6db16cd270f698089c97beb70f4f54 /contrib/cirrus/setup_environment.sh
parentd652c8656d7425c34234071eddb55cbba9ac070f (diff)
downloadpodman-72007746aaa32ae0e098d62010209ebdf52bf037.tar.gz
podman-72007746aaa32ae0e098d62010209ebdf52bf037.tar.bz2
podman-72007746aaa32ae0e098d62010209ebdf52bf037.zip
Cirrus: Temp. override container-selinux on F29
Also, undo oooooold runc package hack Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
-rwxr-xr-xcontrib/cirrus/setup_environment.sh11
1 files changed, 7 insertions, 4 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 55706954e..3818abbc7 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -58,11 +58,14 @@ then
# Always install runc on Ubuntu
install_runc_from_git
;;
- fedora-29) ;& # Continue to the next item
+ fedora-29)
+ CON_SEL="https://kojipkgs.fedoraproject.org/packages/container-selinux/2.100/1.git3b78187.fc29/noarch/container-selinux-2.100-1.git3b78187.fc29.noarch.rpm"
+ echo ">>>>> OVERRIDING container-selinux WITH $CON_SEL <<<<<"
+ dnf -y install $CON_SEL
+ ;& # Continue to the next item
fedora-28)
- RUNC="https://kojipkgs.fedoraproject.org/packages/runc/1.0.0/55.dev.git578fe65.fc${OS_RELEASE_VER}/x86_64/runc-1.0.0-55.dev.git578fe65.fc${OS_RELEASE_VER}.x86_64.rpm"
- echo ">>>>> OVERRIDING RUNC WITH $RUNC <<<<<"
- dnf -y install "$RUNC"
+ echo ">>>>> OVERRIDING source-built runc with latest package <<<<<"
+ dnf update -y runc
;& # Continue to the next item
centos-7) ;&
rhel-7)