Skip to content

Internal change #12296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −5
Open

Internal change #12296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .buildkite/pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,17 +429,17 @@ steps:
arch: "amd64"
- <<: *common
<<: *docker
label: ":docker: Containerd 1.6.2 tests (cgroupv1)"
command: make containerd-test-1.6.2
label: ":docker: Containerd 1.7.25 tests (cgroupv1)"
command: make containerd-test-1.7.25
agents:
<<: *platform_specific_agents
<<: *ubuntu_agents
cgroup: "v1"
- <<: *common
<<: *docker
<<: *source_test
label: ":docker: Containerd 1.6.2 tests (cgroupv2)"
command: make containerd-test-1.6.2
label: ":docker: Containerd 1.7.25 tests (cgroupv2)"
command: make containerd-test-1.7.25
agents:
<<: *ubuntu_agents
cgroup: "v2"
Expand Down
2 changes: 1 addition & 1 deletion test/root/crictl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ func TestHomeDir(t *testing.T) {
})
}

const containerdRuntime = "runsc"
const containerdRuntime = "runc"

// containerdConfigv14 is the containerd (1.4-) configuration file that
// configures the gVisor shim.
Expand Down