[DNM] clh: Add a ci job for crio tests

.ci/jenkins_job_build.sh

@@ -253,6 +253,23 @@ case "${CI_JOB}" in
 	export TEST_DOCKER="true"
 	export experimental_kernel="true"
 	;;
+"CLOUD-HYPERVISOR-K8S-CONTAINERD")
+	init_ci_flags
+	export CRI_CONTAINERD="yes"
+	export CRI_RUNTIME="containerd"
+	export KATA_HYPERVISOR="cloud-hypervisor"
+	export KUBERNETES="yes"
+	export experimental_kernel="true"
+	;;
+"CLOUD-HYPERVISOR-K8S-CRIO")
+	init_ci_flags
+	export CRIO="yes"
+	export CRI_RUNTIME="crio"
+	export KATA_HYPERVISOR="cloud-hypervisor"
+	export KUBERNETES="yes"
+	export TEST_CRIO="true"
+	export experimental_kernel="true"
+	;;
 "CLOUD-HYPERVISOR-K8S-E2E-CRIO-MINIMAL")
 	init_ci_flags
 	export CRIO="yes"

.ci/run.sh

@@ -47,12 +47,6 @@ case "${CI_JOB}" in
 		sudo -E PATH="$PATH" bash -c "make crio"
 		;;
 	"CLOUD-HYPERVISOR")
-		echo "INFO: Containerd checks"
-		sudo -E PATH="$PATH" bash -c "make cri-containerd"
-
-		echo "INFO: Running kubernetes tests"
-		sudo -E PATH="$PATH" bash -c "make kubernetes"
-
 		echo "INFO: Running soak test"
 		sudo -E PATH="$PATH" bash -c "make docker-stability"
 
@@ -74,6 +68,20 @@ END
 		echo "INFO: Running podman integration tests"
 		bash -c "make podman"
 		;;
+	"CLOUD-HYPERVISOR-K8S-CONTAINERD")
+		echo "INFO: Containerd checks"
+		sudo -E PATH="$PATH" bash -c "make cri-containerd"
+
+		echo "INFO: Running kubernetes tests with containerd"
+		sudo -E PATH="$PATH" bash -c "make kubernetes"
+		;;
+	"CLOUD-HYPERVISOR-K8S-CRIO")
+		echo "INFO: Running crio tests"
+		sudo -E PATH="$PATH" bash -c "make crio"
+
+		echo "INFO: Running kubernetes tests with cri-o"
+		sudo -E PATH="$PATH" bash -c "make kubernetes"
+		;;
 	"CLOUD-HYPERVISOR-K8S-E2E-CRIO-MINIMAL")
 		sudo -E PATH="$PATH" bash -c "make kubernetes-e2e"
 		;;

integration/cri-o/crio_skip_tests.sh

@@ -22,4 +22,8 @@ if [ "${KATA_HYPERVISOR}" == "firecracker" ]; then
 	skipCRIOTests+=(
 		'test "privileged ctr device add"'
 	)
+elif [ "${KATA_HYPERVISOR}" == "cloud-hypervisor" ]; then
+	skipCRIOTests+=(
+		'test "privileged ctr device add"'
+	)
 fi