From 7319cff77a87b2ab7b687b17461ba94c743a75e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano.fidencio@intel.com>
Date: Thu, 13 Jul 2023 11:31:50 +0200
Subject: [PATCH] ci: cri-containerd: Add LTS / Active versions for containerd
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As we'll be testing against the LTS and the Active versions of
containers, let's add those entries to the versions.yaml file and make
sure we export what we want to use for the tests as an env var.

The approach taken should not break the current way of getting the
containerd version.

LTS and Active versions of containerd can be found at:
https://containerd.io/releases/#support-horizon

Fixes: #6543

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
---
 .github/workflows/run-cri-containerd-tests.yaml | 2 ++
 versions.yaml                                   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.github/workflows/run-cri-containerd-tests.yaml b/.github/workflows/run-cri-containerd-tests.yaml
index 42dfd928a0..df83cc8e42 100644
--- a/.github/workflows/run-cri-containerd-tests.yaml
+++ b/.github/workflows/run-cri-containerd-tests.yaml
@@ -14,9 +14,11 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
+        containerd_version: ['lts', 'active']
         vmm: ['clh', 'qemu']
     runs-on: garm-ubuntu-2204
     env:
+      CONTAINERD_VERSION: ${{ matrix.containerd_version }}
       GOPATH: ${{ github.workspace }}
       KATA_HYPERVSIOR: ${{ matrix.vmm }}
     steps:
diff --git a/versions.yaml b/versions.yaml
index b09b8fc172..a1ce76f9ff 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -228,6 +228,8 @@ externals:
     # 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"
 
   critools:
     description: "CLI tool for Container Runtime Interface (CRI)"