From e2d5663b763b7dc88c0f268d52df27f165ba2a05 Mon Sep 17 00:00:00 2001
From: Ayush Ranjan <ayushranjan@google.com>
Date: Thu, 13 Oct 2022 13:08:09 -0700
Subject: [PATCH] Update containerd tests to use versions 1.5.11 and 1.6.2.

These versions are compatible with Go 1.18. There are a lot of OSS bugs
about this issue. Notable discussions:
- golang/go#51285
- containerd/containerd#6586

This was fixed upstream in the main branch in containerd/containerd#6605.
The fix was back-ported to v1.5 and v1.6 in containerd/containerd#6716
and containerd/containerd#6717 respectively.

These backports are available in the following versions:
```shell
/tmp/gopathJJGZf/containerd$ git tag --contains 765df66099eec88d0365eaa1e9a933877a058f0b
v1.6.2
v1.6.3
v1.6.4
v1.6.5
v1.6.6
v1.6.7
v1.6.8
/tmp/gopathJJGZf/containerd$ git tag --contains 86bec213720b54bf9ea2813e2c2a577271af58d3
v1.5.11
v1.5.12
v1.5.13
```

So use the smallest versions out of them.

PiperOrigin-RevId: 480965567
---
 .buildkite/pipeline.yaml    | 16 ++++++++--------
 Makefile                    |  4 ++--
 tools/install_containerd.sh |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 23a5347d0..559586381 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -313,8 +313,8 @@ steps:
       <<: *ubuntu_agents
       cgroup: "v2"
   - <<: *common
-    label: ":docker: Containerd 1.5.4 tests (cgroupv1)"
-    command: make containerd-test-1.5.4
+    label: ":docker: Containerd 1.5.11 tests (cgroupv1)"
+    command: make containerd-test-1.5.11
     agents:
       <<: *platform_specific_agents
       <<: *ubuntu_agents
@@ -322,22 +322,22 @@ steps:
   - <<: *common
     # See above: not truly a source test.
     <<: *source_test
-    label: ":docker: Containerd 1.5.4 tests (cgroupv2)"
-    command: make containerd-test-1.5.4
+    label: ":docker: Containerd 1.5.11 tests (cgroupv2)"
+    command: make containerd-test-1.5.11
     agents:
       <<: *ubuntu_agents
       cgroup: "v2"
   - <<: *common
-    label: ":docker: Containerd 1.6.0-rc.4 tests (cgroupv1)"
-    command: make containerd-test-1.6.0-rc.4
+    label: ":docker: Containerd 1.6.2 tests (cgroupv1)"
+    command: make containerd-test-1.6.2
     agents:
       <<: *platform_specific_agents
       <<: *ubuntu_agents
       cgroup: "v1"
   - <<: *common
     <<: *source_test
-    label: ":docker: Containerd 1.6.0-rc.4 tests (cgroupv2)"
-    command: make containerd-test-1.6.0-rc.4
+    label: ":docker: Containerd 1.6.2 tests (cgroupv2)"
+    command: make containerd-test-1.6.2
     agents:
       <<: *ubuntu_agents
       cgroup: "v2"
diff --git a/Makefile b/Makefile
index 9e7ebc822..395a75127 100644
--- a/Makefile
+++ b/Makefile
@@ -340,8 +340,8 @@ containerd-tests-min: containerd-test-1.4.12
 ##
 containerd-tests:
 containerd-tests: containerd-test-1.4.12
-containerd-tests: containerd-test-1.5.9
-containerd-tests: containerd-test-1.6.0
+containerd-tests: containerd-test-1.5.11
+containerd-tests: containerd-test-1.6.2
 
 ##
 ## Benchmarks.
diff --git a/tools/install_containerd.sh b/tools/install_containerd.sh
index f70677018..599647e45 100755
--- a/tools/install_containerd.sh
+++ b/tools/install_containerd.sh
@@ -22,7 +22,7 @@ declare -r CONTAINERD_MINOR="$(echo ${CONTAINERD_VERSION} | awk -F '.' '{ print
 declare -r CRITOOLS_VERSION=${CRITOOLS_VERSION:-1.18.0}
 
 if [[ "${CONTAINERD_MAJOR}" -eq 1 ]] && [[ "${CONTAINERD_MINOR}" -le 4 ]]; then
-  # We're running Go 1.16, but using pre-module containerd and cri-tools.
+  # We're running Go 1.18, but using pre-module containerd and cri-tools.
   export GO111MODULE=off
 fi