diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-12-01 06:36:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-01 06:36:51 -0800 |
| commit | 41f250c4861b9950b63dc7501211d13b6e0bd5ed (patch) | |
| tree | 088715bf479c5c49f058520ec590054f514535a9 /contrib/cirrus/setup_environment.sh | |
| parent | 6b8f89d07447959635fa0c345933cd4fbadc9682 (diff) | |
| parent | deeb3eaf7dde436fd23f8bcb03d30021e2b27c0b (diff) | |
| download | podman-41f250c4861b9950b63dc7501211d13b6e0bd5ed.tar.gz podman-41f250c4861b9950b63dc7501211d13b6e0bd5ed.tar.bz2 podman-41f250c4861b9950b63dc7501211d13b6e0bd5ed.zip | |
Merge pull request #1903 from giuseppe/fix-rootless-tests
tests: fix rootless tests on Ubuntu
Diffstat (limited to 'contrib/cirrus/setup_environment.sh')
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 2 |
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 |