ci: add CC_CRI_CONTAINERD job

Added the CC_CRI_CONTAINERD job type which will configure the kata containers build for running the Confidential Containers tests for containerd. Fixes #4509 Signed-off-by: Wainer dos Santos Moschetta <[email protected]>
kata-containers · Feb 28, 2022 · 0678bab · 0678bab
1 parent 5e4180b
commit 0678bab
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/.ci/ci_job_flags.sh b/.ci/ci_job_flags.sh
@@ -93,13 +93,24 @@ case "${CI_JOB}" in
 	export KATA_HYPERVISOR="qemu"
 	export KUBERNETES="no"
 	;;
-"CRI_CONTAINERD"|"CRI_CONTAINERD_K8S")
+"CRI_CONTAINERD"|"CRI_CONTAINERD_K8S"|"CC_CRI_CONTAINERD")
 	# This job only tests containerd + k8s
 	init_ci_flags
 	export CRI_CONTAINERD="yes"
 	export CRI_RUNTIME="containerd"
 	export KATA_HYPERVISOR="qemu"
-	[ "${CI_JOB}" == "CRI_CONTAINERD_K8S" ] && export KUBERNETES="yes"
+	case "${CI_JOB}" in
+		"CRI_CONTAINERD_K8S")
+			export KUBERNETES="yes"
+			;;
+		"CC_CRI_CONTAINERD")
+			# Export any CC specific environment variables
+			export CCV0="yes"
+			#export SKOPEO=${SKOPEO:-}
+			export UMOCI=yes
+			export SECCOMP=yes
+			;;
+	esac
 	;;
 "CRIO_K8S")
 	init_ci_flags

diff --git a/.ci/run.sh b/.ci/run.sh
@@ -57,6 +57,10 @@ case "${CI_JOB}" in
 		echo "INFO: Running ksm test"
 		sudo -E PATH="$PATH" CRI_RUNTIME="containerd" bash -c "make ksm"
 		;;
+	"CC_CRI_CONTAINERD")
+		echo "INFO: Running Confidential Container tests"
+		sudo -E PATH="$PATH" CRI_RUNTIME="containerd" bash -c "make cc-containerd"
+		;;
 	"CRIO_K8S")
 		echo "INFO: Running kubernetes tests"
 		sudo -E PATH="$PATH" bash -c "make kubernetes"