netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update containerd tests to use versions 1.5.11 and 1.6.2.

Browse Source 
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
This commit is contained in:
Ayush Ranjan
2022-10-13 13:10:59 -07:00
committed by gVisor bot
parent 49874d2cff
commit e2d5663b76
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.buildkite/pipeline.yaml
+8 -8
View File
@@ -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"
Makefile
+2 -2
View File
@@ -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.
tools/install_containerd.sh
+1 -1
View File
@@ -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