From 20442c0eaeb95499db3a870a755b0726c06b7151 Mon Sep 17 00:00:00 2001 From: Zvonko Kaiser Date: Wed, 27 Nov 2024 18:46:37 +0000 Subject: [PATCH] ci: Fix variant for confidential targets The default initrd confidential target will have a variant=confidential we need to accomodate this and make sure we also accomodate aaa-xxx-confidential targets. Signed-off-by: Zvonko Kaiser --- .../packaging/kata-deploy/local-build/kata-deploy-binaries.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh index 43d256f0fd..04208dca08 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -373,7 +373,7 @@ install_image() { os_name="$(get_from_kata_deps ".assets.image.architecture.${ARCH}.${variant}.name")" os_version="$(get_from_kata_deps ".assets.image.architecture.${ARCH}.${variant}.version")" - if [ "${variant}" == "confidential" ]; then + if [[ "${variant}" == *confidential ]]; then export COCO_GUEST_COMPONENTS_TARBALL="$(get_coco_guest_components_tarball_path)" export PAUSE_IMAGE_TARBALL="$(get_pause_image_tarball_path)" fi @@ -448,7 +448,7 @@ install_initrd() { os_name="$(get_from_kata_deps ".assets.initrd.architecture.${ARCH}.${variant}.name")" os_version="$(get_from_kata_deps ".assets.initrd.architecture.${ARCH}.${variant}.version")" - if [[ "${variant}" == *-confidential ]]; then + if [[ "${variant}" == *confidential ]]; then export COCO_GUEST_COMPONENTS_TARBALL="$(get_coco_guest_components_tarball_path)" export PAUSE_IMAGE_TARBALL="$(get_pause_image_tarball_path)" fi