From 25c65171055e267d00df10a36ede442fa2e3f003 Mon Sep 17 00:00:00 2001
From: Fabricio Voznika <fvoznika@google.com>
Date: Wed, 2 Mar 2022 11:52:23 -0800
Subject: [PATCH] Drop support for containerd 1.3

Update containerd versions used in test to the latest of each
minor version.

PiperOrigin-RevId: 431993047
---
 Makefile | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 3544e959e..be5b79ed4 100644
--- a/Makefile
+++ b/Makefile
@@ -315,22 +315,18 @@ else
 endif
 	@$(call sudo,test/root:root_test,--runtime=$(RUNTIME) -test.v)
 
-ifeq ($(CGROUPV2),false)
-containerd-tests-min: containerd-test-1.3.9
-else
-containerd-tests-min: containerd-test-1.4.3
-endif
+containerd-tests-min: containerd-test-1.4.12
 
-# The shim builds with containerd 1.3.9 and it's not backward compatible. Test
-# with 1.3.9 and newer versions.
-# When run under cgroupv2 environment, skip 1.3.9 as it does not support cgroupv2
-containerd-tests: ## Runs all supported containerd version tests.
-ifeq ($(CGROUPV2),false)
-containerd-tests: containerd-test-1.3.9
-endif
-containerd-tests: containerd-test-1.4.3
-containerd-tests: containerd-test-1.5.4
-containerd-tests: containerd-test-1.6.0-rc.4
+##
+## 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.9
+containerd-tests: containerd-test-1.6.0
 
 ##
 ## Benchmarks.