From cecb71dc37a77d8e4e88cdfada92a37a72c67602 Mon Sep 17 00:00:00 2001
From: Adin Scannell <ascannell@google.com>
Date: Tue, 4 Jun 2019 23:08:20 -0700
Subject: Building containerd with go modules is broken, use GOPATH.

PiperOrigin-RevId: 251583707
---
 tools/run_tests.sh | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/tools/run_tests.sh b/tools/run_tests.sh
index dc282c142..b35d2e4b8 100755
--- a/tools/run_tests.sh
+++ b/tools/run_tests.sh
@@ -106,18 +106,31 @@ install_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_crictl_test_deps() {
   sudo -n -E apt-get update
   sudo -n -E apt-get install -y btrfs-tools libseccomp-dev
 
-  # Install containerd.
-  [[ -d containerd ]] || git clone https://github.com/containerd/containerd
-  (cd containerd && git checkout v1.2.2 && make && sudo -n -E make install)
-
-  # 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 containerd & cri-tools.
+  GOPATH=$(mktemp -d --tmpdir gopathXXXXX)
+  install_helper github.com/containerd/containerd v1.2.2 "${GOPATH}"
+  install_helper github.com/kubernetes-sigs/cri-tools v1.11.0 "${GOPATH}"
 
   # Install gvisor-containerd-shim.
   local latest=/tmp/gvisor-containerd-shim-latest
@@ -143,7 +156,8 @@ EOF
   sudo mv ${shim_config_tmp_path} ${shim_config_path}
 
   # 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.
-- 
cgit v1.2.3