containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3003 from cevich/temp_selinux_workaround 

Cirrus: Temp. override container-selinux on F29
This commit is contained in:
OpenShift Merge Robot 2019-04-24 09:50:12 -07:00 committed by GitHub
parent d652c8656d 72007746aa
commit b4cba6090d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/cirrus/lib.sh
View File

@ -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]

11
contrib/cirrus/setup_environment.sh
View File

@ -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)