github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-20 08:18:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10590 from zvonkok/fix-ci

Browse Source 
ci: Fix variant for confidential targets
This commit is contained in:
Hyounggyu Choi
2024-12-02 18:39:52 +01:00
committed by GitHub
parent 6f4f94a9f0 20442c0eae
commit 9c19d7674a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
View File

@@ -373,7 +373,7 @@ install_image() {
os_name="$(get_from_kata_deps ".assets.image.architecture.${ARCH}.${variant}.name")" os_name="$(get_from_kata_deps ".assets.image.architecture.${ARCH}.${variant}.name")"
os_version="$(get_from_kata_deps ".assets.image.architecture.${ARCH}.${variant}.version")" 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 COCO_GUEST_COMPONENTS_TARBALL="$(get_coco_guest_components_tarball_path)"
export PAUSE_IMAGE_TARBALL="$(get_pause_image_tarball_path)" export PAUSE_IMAGE_TARBALL="$(get_pause_image_tarball_path)"
fi fi
@@ -448,7 +448,7 @@ install_initrd() {
os_name="$(get_from_kata_deps ".assets.initrd.architecture.${ARCH}.${variant}.name")" os_name="$(get_from_kata_deps ".assets.initrd.architecture.${ARCH}.${variant}.name")"
os_version="$(get_from_kata_deps ".assets.initrd.architecture.${ARCH}.${variant}.version")" 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 COCO_GUEST_COMPONENTS_TARBALL="$(get_coco_guest_components_tarball_path)"
export PAUSE_IMAGE_TARBALL="$(get_pause_image_tarball_path)" export PAUSE_IMAGE_TARBALL="$(get_pause_image_tarball_path)"
fi fi