go
/
gvisor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Building containerd with go modules is broken, use GOPATH. 

PiperOrigin-RevId: 251583707
This commit is contained in:
Adin Scannell 2019-06-04 23:08:20 -07:00 committed by Shentubot
parent e0fb921205
commit cecb71dc37
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tools/run_tests.sh
View File

@ -106,18 +106,31 @@ install_runtime() {
sudo -n ${WORKSPACE_DIR}/runsc/test/install.sh --runtime ${RUNTIME} sudo -n ${WORKSPACE_DIR}/runsc/test/install.sh --runtime ${RUNTIME}
} }
install_helper() {
PACKAGE="${1}"
TAG="${2}"
GOPATH="${3}"
# Clone the repository.
mkdir -p "${GOPATH}"/src/$(dirname "${PACKAGE}") && \
git clone https://"${PACKAGE}" "${GOPATH}"/src/"${PACKAGE}"
# Checkout and build the repository.
(cd "${GOPATH}"/src/"${PACKAGE}" && \
git checkout "${TAG}" && \
GOPATH="${GOPATH}" make && \
sudo -n -E env GOPATH="${GOPATH}" make install)
}
# Install dependencies for the crictl tests. # Install dependencies for the crictl tests.
install_crictl_test_deps() { install_crictl_test_deps() {
sudo -n -E apt-get update sudo -n -E apt-get update
sudo -n -E apt-get install -y btrfs-tools libseccomp-dev sudo -n -E apt-get install -y btrfs-tools libseccomp-dev
# Install containerd. # Install containerd & cri-tools.
[[ -d containerd ]] || git clone https://github.com/containerd/containerd GOPATH=$(mktemp -d --tmpdir gopathXXXXX)
(cd containerd && git checkout v1.2.2 && make && sudo -n -E make install) install_helper github.com/containerd/containerd v1.2.2 "${GOPATH}"
install_helper github.com/kubernetes-sigs/cri-tools v1.11.0 "${GOPATH}"
# Install crictl.
[[ -d cri-tools ]] || git clone https://github.com/kubernetes-sigs/cri-tools
(cd cri-tools && git checkout tags/v1.11.0 && make && sudo -n -E make install)
# Install gvisor-containerd-shim. # Install gvisor-containerd-shim.
local latest=/tmp/gvisor-containerd-shim-latest local latest=/tmp/gvisor-containerd-shim-latest
@ -143,7 +156,8 @@ EOF
sudo mv ${shim_config_tmp_path} ${shim_config_path} sudo mv ${shim_config_tmp_path} ${shim_config_path}
# Configure CNI. # Configure CNI.
sudo -n -E env PATH=${PATH} containerd/script/setup/install-cni (cd "${GOPATH}" && sudo -n -E env PATH="${PATH}" GOPATH="${GOPATH}" \
src/github.com/containerd/containerd/script/setup/install-cni)
} }
# Run the tests that require docker. # Run the tests that require docker.