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/lib.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/lib.sh')
| -rw-r--r-- | contrib/cirrus/lib.sh | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh index 6d43c6ea5..04314e5fe 100644 --- a/contrib/cirrus/lib.sh +++ b/contrib/cirrus/lib.sh @@ -157,6 +157,19 @@ install_cni_plugins() { sudo cp bin/* /usr/libexec/cni } +install_runc_from_git(){ + wd=$(pwd) + DEST="$GOPATH/src/github.com/opencontainers/runc" + rm -rf "$DEST" + ooe.sh git clone https://github.com/opencontainers/runc.git "$DEST" + cd "$DEST" + ooe.sh git fetch origin --tags + ooe.sh git checkout -q "$RUNC_COMMIT" + ooe.sh make static BUILDTAGS="seccomp selinux" + sudo install -m 755 runc /usr/bin/runc + cd $wd +} + install_runc(){ OS_RELEASE_ID=$(os_release_id) echo "Installing RunC from commit $RUNC_COMMIT" @@ -179,14 +192,7 @@ install_runc(){ cd "$GOPATH/src/github.com/containers/libpod" ooe.sh sudo make install.libseccomp.sudo fi - DEST="$GOPATH/src/github.com/opencontainers/runc" - rm -rf "$DEST" - ooe.sh git clone https://github.com/opencontainers/runc.git "$DEST" - cd "$DEST" - ooe.sh git fetch origin --tags - ooe.sh git checkout -q "$RUNC_COMMIT" - ooe.sh make static BUILDTAGS="seccomp selinux" - sudo install -m 755 runc /usr/bin/runc + install_runc_from_git } install_buildah() { |