From d5bc1177c03e108bc969658991de3dba90786aa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <ffidencio@nvidia.com>
Date: Wed, 3 Jun 2026 13:02:55 +0200
Subject: [PATCH] tests: focus kata-monitor CI on containerd active
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Drop the stale CRI-O matrix entry (its cri-tools pin was several
releases behind) along with the exclude that hid the containerd job,
and pin the remaining job to containerd's "active" track (currently
v2.2) via CONTAINERD_VERSION.

Signed-off-by: Fabiano Fidêncio <ffidencio@nvidia.com>
Assisted-by: OpenAI Codex <codex@openai.com>
---
 .github/workflows/run-kata-monitor-tests.yaml | 13 +++-------
 tests/functional/kata-monitor/gha-run.sh      | 24 ++++++-------------
 2 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/run-kata-monitor-tests.yaml b/.github/workflows/run-kata-monitor-tests.yaml
index bbb4772e6b..c39c1d9ac0 100644
--- a/.github/workflows/run-kata-monitor-tests.yaml
+++ b/.github/workflows/run-kata-monitor-tests.yaml
@@ -28,23 +28,16 @@ jobs:
         vmm:
           - qemu
         container_engine:
-          - crio
           - containerd
-        # TODO: enable when https://github.com/kata-containers/kata-containers/issues/9853 is fixed
-        #include:
-        #  - container_engine: containerd
-        #    containerd_version: latest
-        exclude:
-          # TODO: enable with containerd when https://github.com/kata-containers/kata-containers/issues/9761 is fixed
-          - container_engine: containerd
-            vmm: qemu
+        containerd_version:
+          - active
     concurrency:
       group: ${{ github.workflow }}-${{ github.job }}-${{ github.event.pull_request.number || github.ref }}-${{ toJSON(matrix) }}
       cancel-in-progress: true
     runs-on: ubuntu-22.04
     env:
       CONTAINER_ENGINE: ${{ matrix.container_engine }}
-      #CONTAINERD_VERSION: ${{ matrix.containerd_version }}
+      CONTAINERD_VERSION: ${{ matrix.containerd_version }}
       KATA_HYPERVISOR: ${{ matrix.vmm }}
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
diff --git a/tests/functional/kata-monitor/gha-run.sh b/tests/functional/kata-monitor/gha-run.sh
index 1877bc80f8..ec775e68fa 100755
--- a/tests/functional/kata-monitor/gha-run.sh
+++ b/tests/functional/kata-monitor/gha-run.sh
@@ -33,35 +33,25 @@ function install_dependencies() {
 
 	ensure_yq
 
-	# Dependency list of projects that we can install them
+	# Dependency list of projects that we can install
 	# directly from their releases on GitHub:
 	# - cri-tools
 	# - containerd
 	#   - cri-container-cni release tarball already includes CNI plugins
+	# - runc
+	# - cni-plugins
 	cri_tools_version=$(get_from_kata_deps ".externals.critools.latest")
 	declare -a github_deps
 	github_deps[0]="cri_tools:${cri_tools_version}"
 	# shellcheck disable=SC2154
-	case "${CONTAINER_ENGINE}" in
-		containerd)
-			# shellcheck disable=SC2154
-			github_deps[1]="cri_containerd:$(get_from_kata_deps ".externals.containerd.${CONTAINERD_VERSION}")"
-			github_deps[2]="runc:$(get_from_kata_deps ".externals.runc.latest")"
-			github_deps[3]="cni_plugins:$(get_from_kata_deps ".externals.cni-plugins.version")"
-			;;
-		crio)
-			github_deps[1]="cni_plugins:$(get_from_kata_deps ".externals.cni-plugins.version")"
-			;;
-	esac
+	github_deps[1]="cri_containerd:$(get_from_kata_deps ".externals.containerd.${CONTAINERD_VERSION}")"
+	github_deps[2]="runc:$(get_from_kata_deps ".externals.runc.latest")"
+	github_deps[3]="cni_plugins:$(get_from_kata_deps ".externals.cni-plugins.version")"
 
 	for github_dep in "${github_deps[@]}"; do
 		IFS=":" read -r -a dep <<< "${github_dep}"
 		"install_${dep[0]}" "${dep[1]}"
 	done
-
-	if [[ "${CONTAINER_ENGINE}" = "crio" ]]; then
-		install_crio "${cri_tools_version#v}"
-	fi
 }
 
 function run() {
@@ -69,7 +59,7 @@ function run() {
 	info "Running cri-containerd tests using ${KATA_HYPERVISOR} hypervisor"
 
 	enabling_hypervisor
-	bash -c "${kata_monitor_dir}/kata-monitor-tests.sh"
+	bash "${kata_monitor_dir}/kata-monitor-tests.sh"
 }
 
 function main() {