From 7024d3c6008180d976207f4012f838feb6504b38 Mon Sep 17 00:00:00 2001
From: Fupan Li <fupan.lfp@antgroup.com>
Date: Thu, 13 Feb 2025 22:25:34 +0800
Subject: [PATCH] CI: cri-containerd: upgrade the LTS / Active versions for
 containerd

As we're testing against the LTS and the Active versions of
containers, let's upgrade the lts version from 1.6 to 1.7 and
active version from 1.7 to 2.0 to cover the sandboxapi tests.

Signed-off-by: Fupan Li <fupan.lfp@antgroup.com>
---
 .github/workflows/basic-ci-amd64.yaml                 | 4 +---
 tests/integration/cri-containerd/integration-tests.sh | 3 +++
 versions.yaml                                         | 9 +++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/basic-ci-amd64.yaml b/.github/workflows/basic-ci-amd64.yaml
index 0842fba223..9d155f5043 100644
--- a/.github/workflows/basic-ci-amd64.yaml
+++ b/.github/workflows/basic-ci-amd64.yaml
@@ -63,15 +63,13 @@ jobs:
       # all the tests due to a single flaky instance.
       fail-fast: false
       matrix:
-        containerd_version: ['latest']
+        containerd_version: ['active']
         vmm: ['dragonball', 'cloud-hypervisor', 'qemu-runtime-rs']
     runs-on: ubuntu-22.04
     env:
       CONTAINERD_VERSION: ${{ matrix.containerd_version }}
       GOPATH: ${{ github.workspace }}
       KATA_HYPERVISOR: ${{ matrix.vmm }}
-      #the latest containerd from 2.0 need to set the CGROUP_DRIVER for e2e testing
-      CGROUP_DRIVER: ""
       SANDBOXER: "shim"
     steps:
       - uses: actions/checkout@v4
diff --git a/tests/integration/cri-containerd/integration-tests.sh b/tests/integration/cri-containerd/integration-tests.sh
index 6dd3b0eec2..c8e6ac3f32 100755
--- a/tests/integration/cri-containerd/integration-tests.sh
+++ b/tests/integration/cri-containerd/integration-tests.sh
@@ -20,6 +20,9 @@ export PATH="$PATH:/usr/local/sbin"
 # golang is installed in /usr/local/go/bin/ add that path
 export PATH="$PATH:/usr/local/go/bin"
 
+#the latest containerd from 2.0 need to set the CGROUP_DRIVER for e2e testing
+export CGROUP_DRIVER=""
+
 # Runtime to be used for testing
 KATA_HYPERVISOR="${KATA_HYPERVISOR:-qemu}"
 RUNTIME=${RUNTIME:-containerd-shim-kata-${KATA_HYPERVISOR}-v2}
diff --git a/versions.yaml b/versions.yaml
index f685949fcf..ae8a2ed48c 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -261,10 +261,11 @@ externals:
     # containerd from v1.5.0 used the path unix socket
     # instead of abstract socket, thus kata wouldn's support the containerd's
     # version older than them.
-    version: "v1.6.8"
-    lts: "v1.6"
-    active: "v1.7"
-    # add containerd 2.0.0 for sandbox api test
+    version: "v1.7.25"
+    lts: "v1.7"
+    active: "v2.0"
+    # keep the latest version to make the current PR ci work, once it was
+    # merged,we can remove the latest version.
     latest: "v2.0"
 
   critools: