Skip to content

Commit 7f03647

Browse files
milantracygvisor-bot
authored andcommitted
Add containerd-test-1.7.25 to pipelines.
PiperOrigin-RevId: 723323953
1 parent e699298 commit 7f03647

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

.buildkite/pipeline.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,22 @@ steps:
474474
agents:
475475
<<: *ubuntu_agents
476476
cgroup: "v2"
477+
- <<: *common
478+
<<: *docker
479+
label: ":docker: Containerd 1.7.26 tests (cgroupv1)"
480+
command: make containerd-test-1.7.26
481+
agents:
482+
<<: *platform_specific_agents
483+
<<: *ubuntu_agents
484+
cgroup: "v1"
485+
- <<: *common
486+
<<: *docker
487+
<<: *source_test
488+
label: ":docker: Containerd 1.7.26 tests (cgroupv2)"
489+
command: make containerd-test-1.7.26
490+
agents:
491+
<<: *ubuntu_agents
492+
cgroup: "v2"
477493
- <<: *common
478494
<<: *source_test
479495
label: ":podman: Podman"

tools/install_containerd.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,9 @@ log_level = "debug"
128128
file-access = "shared"
129129
EOF
130130

131-
# Configure CNI.
132-
(cd "${GOPATH}" && src/github.com/containerd/containerd/script/setup/install-cni)
131+
# Configure CNI, install-cni depends on go.mod to determine the version
132+
# of github.com/containernetworking/plugins for CNI.
133+
(cd "${GOPATH}"/src/github.com/containerd/containerd/ && ./script/setup/install-cni)
133134
tee /etc/cni/net.d/10-bridge.conf <<EOF
134135
{
135136
"cniVersion": "0.3.1",

0 commit comments

Comments
 (0)