summaryrefslogtreecommitdiff
path: root/contrib/cirrus/setup_environment.sh
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2018-11-30 21:27:21 +0100
committerGiuseppe Scrivano <gscrivan@redhat.com>2018-12-01 06:46:24 +0100
commitdeeb3eaf7dde436fd23f8bcb03d30021e2b27c0b (patch)
tree088715bf479c5c49f058520ec590054f514535a9 /contrib/cirrus/setup_environment.sh
parentbabb7c248b1685bc67703e96755080eff3792795 (diff)
downloadpodman-deeb3eaf7dde436fd23f8bcb03d30021e2b27c0b.tar.gz
podman-deeb3eaf7dde436fd23f8bcb03d30021e2b27c0b.tar.bz2
podman-deeb3eaf7dde436fd23f8bcb03d30021e2b27c0b.zip
tests: always install runc on Ubuntu
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
-rwxr-xr-xcontrib/cirrus/setup_environment.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 167db127f..2563b5f43 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -53,6 +53,8 @@ then
# Some setup needs to vary between distros
case "${OS_RELEASE_ID}-${OS_RELEASE_VER}" in
ubuntu-18)
+ # Always install runc on Ubuntu
+ install_runc_from_git
envstr='export BUILDTAGS="seccomp $($GOSRC/hack/btrfs_tag.sh) $($GOSRC/hack/btrfs_installed_tag.sh) $($GOSRC/hack/ostree_tag.sh) varlink exclude_graphdriver_devicemapper"'
;;
fedora-28) ;& # Continue to the next item