From bf5395a86823d8a16c7fe2827e0c9e410e7ad9e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 19 Sep 2023 14:02:48 +0200 Subject: [PATCH] ci: Add FORKED_CONTAINERD env var to the tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will represent whether we will use the forked containerd for the Confidential Containers use case or not. This will never land into the main branch, but it's needed here for the time being. Signed-off-by: Fabiano FidĂȘncio --- .ci/ci_job_flags.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.ci/ci_job_flags.sh b/.ci/ci_job_flags.sh index 8d5a52536..851215805 100755 --- a/.ci/ci_job_flags.sh +++ b/.ci/ci_job_flags.sh @@ -37,6 +37,9 @@ init_ci_flags() { # Build Kata for Confidential Containers # Values: "yes|no" export KATA_BUILD_CC="no" + # Use the forked version of containerd for Confidential Containers + # Valyes: "yes|no" + export FORKED_CONTAINERD="no" # Hypervisor to use export KATA_HYPERVISOR="" # Install k8s @@ -119,6 +122,7 @@ case "${CI_JOB}" in "CC_CRI_CONTAINERD"|"CC_CRI_CONTAINERD_K8S") # Export any CC specific environment variables export KATA_BUILD_CC="yes" + export FORKED_CONTAINERD="yes" export MEASURED_ROOTFS="yes" export AA_KBC="offline_fs_kbc" if [[ "${CI_JOB}" =~ K8S ]]; then @@ -133,6 +137,7 @@ case "${CI_JOB}" in export CRI_RUNTIME="containerd" export KATA_HYPERVISOR="qemu" export KATA_BUILD_CC="yes" + export FORKED_CONTAINERD="yes" export AA_KBC="offline_fs_kbc" export TEST_INITRD="yes" if [[ "${CI_JOB}" =~ K8S ]]; then @@ -155,6 +160,7 @@ case "${CI_JOB}" in export CRI_RUNTIME="containerd" export KATA_HYPERVISOR="qemu" export KATA_BUILD_CC="yes" + export FORKED_CONTAINERD="yes" export MEASURED_ROOTFS="yes" export AA_KBC="cc_kbc" export TEE_TYPE="tdx" @@ -174,6 +180,7 @@ case "${CI_JOB}" in export KUBERNETES="yes" export AA_KBC="offline_fs_kbc" export KATA_BUILD_CC="yes" + export FORKED_CONTAINERD="yes" export MEASURED_ROOTFS="yes" if [[ "${CI_JOB}" =~ TDX ]]; then export TEE_TYPE="tdx" @@ -199,6 +206,7 @@ case "${CI_JOB}" in export KATA_HYPERVISOR="cloud-hypervisor" # Export any CC specific environment variables export KATA_BUILD_CC="yes" + export FORKED_CONTAINERD="yes" export MEASURED_ROOTFS="yes" export AA_KBC="offline_fs_kbc" ;;