6 files changed, 36 insertions, 16 deletions
diff --git a/tools/go_branch.sh b/tools/go_branch.sh
index 8ea6a6d8d..d9e79401d 100755
--- a/tools/go_branch.sh
+++ b/tools/go_branch.sh
@@ -19,6 +19,7 @@ set -eo pipefail
 # Discovery the package name from the go.mod file.
 declare -r gomod="$(pwd)/go.mod"
 declare -r module=$(cat "${gomod}" | grep -E "^module" | cut -d' ' -f2)
+declare -r gosum="$(pwd)/go.sum"
 
 # Check that gopath has been built.
 declare -r gopath_dir="$(pwd)/bazel-bin/gopath/src/${module}"
@@ -63,6 +64,7 @@ git merge --allow-unrelated-histories --no-commit --strategy ours ${head}
 # Sync the entire gopath_dir and go.mod.
 rsync --recursive --verbose --delete --exclude .git --exclude README.md -L "${gopath_dir}/" .
 cp "${gomod}" .
+cp "${gosum}" .
 
 # There are a few solitary files that can get left behind due to the way bazel
 # constructs the gopath target. Note that we don't find all Go files here
diff --git a/tools/go_generics/generics.go b/tools/go_generics/generics.go
index ca414d8cb..4e5cc53a2 100644
--- a/tools/go_generics/generics.go
+++ b/tools/go_generics/generics.go
@@ -98,7 +98,7 @@ import (
 	"regexp"
 	"strings"
 
-	"gvisor.googlesource.com/gvisor/tools/go_generics/globals"
+	"gvisor.dev/gvisor/tools/go_generics/globals"
 )
 
 var (
diff --git a/tools/go_generics/globals/BUILD b/tools/go_generics/globals/BUILD
index 6628132f5..74853c7d2 100644
--- a/tools/go_generics/globals/BUILD
+++ b/tools/go_generics/globals/BUILD
@@ -8,6 +8,6 @@ go_library(
         "globals_visitor.go",
         "scope.go",
     ],
-    importpath = "gvisor.googlesource.com/gvisor/tools/go_generics/globals",
+    importpath = "gvisor.dev/gvisor/tools/go_generics/globals",
     visibility = ["//tools/go_generics:__pkg__"],
 )
diff --git a/tools/go_generics/imports.go b/tools/go_generics/imports.go
index 3a7230c97..148dc7216 100644
--- a/tools/go_generics/imports.go
+++ b/tools/go_generics/imports.go
@@ -23,7 +23,7 @@ import (
 	"go/token"
 	"strconv"
 
-	"gvisor.googlesource.com/gvisor/tools/go_generics/globals"
+	"gvisor.dev/gvisor/tools/go_generics/globals"
 )
 
 type importedPackage struct {
diff --git a/tools/go_stateify/defs.bzl b/tools/go_stateify/defs.bzl
index 70ce73d7b..11ccfae44 100644
--- a/tools/go_stateify/defs.bzl
+++ b/tools/go_stateify/defs.bzl
@@ -76,7 +76,7 @@ go_stateify = rule(
         "package": attr.string(mandatory = True),
         "out": attr.output(mandatory = True),
         "_tool": attr.label(executable = True, cfg = "host", default = Label("//tools/go_stateify:stateify")),
-        "_statepkg": attr.string(default = "gvisor.googlesource.com/gvisor/pkg/state"),
+        "_statepkg": attr.string(default = "gvisor.dev/gvisor/pkg/state"),
     },
 )
 
diff --git a/tools/run_tests.sh b/tools/run_tests.sh
index dc282c142..7a1f889dd 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.
@@ -161,13 +175,17 @@ run_docker_tests() {
   # configuration, e.g. save/restore not supported with hostnet.
   declare -a variations=("" "-kvm" "-hostnet" "-overlay")
   for v in "${variations[@]}"; do
+    # Change test names otherwise each run of tests will overwrite logs and
+    # results of the previous run.
+    sed -i "s/name = \"integration_test.*\"/name = \"integration_test${v}\"/" runsc/test/integration/BUILD
+    sed -i "s/name = \"image_test.*\"/name = \"image_test${v}\"/" runsc/test/image/BUILD
     # Run runsc tests with docker that are tagged manual.
     bazel test \
       "${BAZEL_BUILD_FLAGS[@]}" \
       --test_env=RUNSC_RUNTIME="${RUNTIME}${v}" \
       --test_output=all \
-      //runsc/test/image:image_test \
-      //runsc/test/integration:integration_test
+      //runsc/test/image:image_test${v} \
+      //runsc/test/integration:integration_test${v}
   done
 }
 
@@ -194,8 +212,8 @@ run_runsc_do_tests() {
   local runsc=$(find bazel-bin/runsc -type f -executable -name "runsc" | head -n1)
 
   # run runsc do without root privileges.
-  unshare -Ur ${runsc} --network=none --TESTONLY-unsafe-nonroot do true
-  unshare -Ur ${runsc} --TESTONLY-unsafe-nonroot --network=host do --netns=false true
+  ${runsc} --rootless do true
+  ${runsc} --rootless --network=none do true
 
   # run runsc do with root privileges.
   sudo -n -E ${runsc} do true