diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-24 09:50:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-24 09:50:12 -0700 |
| commit | b4cba6090d2e44f34f233bee4f2df47582ced7a0 (patch) | |
| tree | 3eea81d38a6db16cd270f698089c97beb70f4f54 | |
| parent | d652c8656d7425c34234071eddb55cbba9ac070f (diff) | |
| parent | 72007746aaa32ae0e098d62010209ebdf52bf037 (diff) | |
| download | podman-b4cba6090d2e44f34f233bee4f2df47582ced7a0.tar.gz podman-b4cba6090d2e44f34f233bee4f2df47582ced7a0.tar.bz2 podman-b4cba6090d2e44f34f233bee4f2df47582ced7a0.zip | |
Merge pull request #3003 from cevich/temp_selinux_workaround
Cirrus: Temp. override container-selinux on F29
| -rw-r--r-- | contrib/cirrus/lib.sh | 1 | ||||
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 11 |
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) |