summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/cirrus/lib.sh1
-rwxr-xr-xcontrib/cirrus/setup_environment.sh11
2 files changed, 7 insertions, 5 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
index 6c45b2c5d..d663616b2 100644
--- a/contrib/cirrus/lib.sh
+++ b/contrib/cirrus/lib.sh
@@ -178,7 +178,6 @@ setup_rootless() {
make install.catatonit
go get github.com/onsi/ginkgo/ginkgo
go get github.com/onsi/gomega/...
- dnf -y update runc
# Guarantee independence from specific values
ROOTLESS_UID=$[RANDOM+1000]
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)