Run containerd integration tests with all supported containerd major versions.

The major supported versions are: 1.6, 1.7, 2.0

PiperOrigin-RevId: 831559954

Author: milantracy

.buildkite/pipeline.yaml

@@ -429,6 +429,7 @@ steps:
       arch: "amd64"
   - <<: *common
     <<: *docker
+    <<: *source_test
     label: ":docker: Containerd 1.6.2 tests (cgroupv1)"
     command: make containerd-test-1.6.2
     agents:
@@ -443,6 +444,44 @@ steps:
     agents:
       <<: *ubuntu_agents
       cgroup: "v2"
+  - <<: *common
+    <<: *docker
+    <<: *source_test
+    label: ":docker: Containerd 1.7.25 tests (cgroupv1)"
+    command: make containerd-test-1.7.25
+    agents:
+      <<: *platform_specific_agents
+      <<: *ubuntu_agents
+      cgroup: "v1"
+      kernel: "modern"
+  - <<: *common
+    <<: *docker
+    <<: *source_test
+    label: ":docker: Containerd 1.7.25 tests (cgroupv2)"
+    command: make containerd-test-1.7.25
+    agents:
+      <<: *ubuntu_agents
+      cgroup: "v2"
+      kernel: "modern"
+  - <<: *common
+    <<: *docker
+    <<: *source_test
+    label: ":docker: Containerd 2.0.6 tests (cgroupv1)"
+    command: make containerd-test-2.0.6
+    agents:
+      <<: *platform_specific_agents
+      <<: *ubuntu_agents
+      cgroup: "v1"
+      kernel: "modern"
+  - <<: *common
+    <<: *docker
+    <<: *source_test
+    label: ":docker: Containerd 2.0.6 tests (cgroupv2)"
+    command: make containerd-test-2.0.6
+    agents:
+      <<: *ubuntu_agents
+      cgroup: "v2"
+      kernel: "modern"
   - <<: *common
     <<: *source_test
     label: ":podman: Podman"

Makefile

@@ -470,19 +470,7 @@ else
 		sudo tar -C "$$(dirname $$(which containerd))" -zxvf - containerd-shim-runsc-v1
 endif
 	@$(call sudo,test/root:root_test,--runtime=$(RUNTIME) -test.v)
-containerd-tests-min: containerd-test-1.4.12
-
-##
-## Containerd tests.
-##
-## Runs all supported containerd version tests. Update as new versions become
-## available.
-##
-containerd-tests:
-containerd-tests: containerd-test-1.4.12
-containerd-tests: containerd-test-1.5.11
-containerd-tests: containerd-test-1.6.2
-containerd-tests: containerd-test-1.7.25
+containerd-tests-min: containerd-test-1.6.2
 
 ##
 ## Benchmarks.

test/root/crictl_test.go

@@ -269,22 +269,6 @@ func TestHomeDir(t *testing.T) {
 
 const containerdRuntime = "runsc"
 
-// containerdConfigv14 is the containerd (1.4-) configuration file that
-// configures the gVisor shim.
-//
-// Note that the v2 shim binary name must be containerd-shim-<runtime>-v1.
-const containerdConfigv14 = `
-disabled_plugins = ["restart"]
-[plugins.cri]
-  disable_tcp_service = true
-[plugins.linux]
-  shim_debug = true
-[plugins.cri.containerd.runtimes.` + containerdRuntime + `]
-  runtime_type = "io.containerd.` + containerdRuntime + `.v1"
-[plugins.cri.containerd.runtimes.` + containerdRuntime + `.options]
-  TypeUrl = "io.containerd.` + containerdRuntime + `.v1.options"
-`
-
 // containerdConfig is the containerd (1.5+) configuration file that
 // configures the gVisor shim.
 //
@@ -496,8 +480,5 @@ func getContainerd() string {
 }
 
 func getContainerdConfig(major, minor uint64) string {
-	if major == 1 && minor <= 4 {
-		return containerdConfigv14
-	}
 	return containerdConfig
 }