github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-23 18:21:27 +00:00
Code Issues Projects Releases Wiki Activity

packaging: Fix qemu experimental build for cc

Browse Source 
Qemu for SNP is experimental. Thus, when building QEMU for SNP we need to create a builder that builds experimental qemu for CC.

Fixes: #7059

Signed-Off-By: Unmesh Deodhar <udeodhar@amd.com>
This commit is contained in:
Unmesh Deodhar 2023-06-08 20:10:19 -05:00
parent 8330fdeadf
commit d06507c5aa
2 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,7 @@ readonly kernel_builder="${static_build_dir}/kernel/build.sh"
readonly ovmf_builder="${static_build_dir}/ovmf/build.sh"
readonly qemu_builder="${static_build_dir}/qemu/build-static-qemu.sh"
readonly qemu_experimental_builder="${static_build_dir}/qemu/build-static-qemu-experimental.sh"
readonly qemu_experimental_cc_builder="${static_build_dir}/qemu/build-static-qemu-experimental-cc.sh"
readonly shimv2_builder="${static_build_dir}/shim-v2/build.sh"
readonly td_shim_builder="${static_build_dir}/td-shim/build.sh"
readonly virtiofsd_builder="${static_build_dir}/virtiofsd/build.sh"
@ -799,15 +800,16 @@ install_qemu_tdx_experimental() {
"${qemu_experimental_builder}"
}
install_qemu_snp_experimental() {
install_cc_snp_qemu_experimental() {
export qemu_suffix="snp-experimental"
export qemu_tarball_name="kata-static-qemu-${qemu_suffix}.tar.gz"
export qemu_tarball_name="kata-static-qemu-${qemu_suffix}-cc.tar.gz"
export tee="snp"
install_qemu_helper \
"assets.hypervisor.qemu-${qemu_suffix}.url" \
"assets.hypervisor.qemu-${qemu_suffix}.tag" \
"qemu-${qemu_suffix}" \
"${qemu_experimental_builder}"
"${qemu_experimental_cc_builder}"
}
# Install static firecracker asset
@ -975,7 +977,6 @@ handle_build() {
install_ovmf
install_ovmf_sev
install_qemu
install_qemu_snp_experimental
install_qemu_tdx_experimental
install_shimv2
install_tdvf
@ -986,6 +987,7 @@ handle_build() {
install_cc_clh
install_cc_kernel
install_cc_qemu
install_cc_snp_qemu_experimental
install_cc_image
install_cc_shimv2
install_cc_virtiofsd
@ -998,7 +1000,7 @@ handle_build() {
cc-qemu) install_cc_qemu ;;
cc-snp-qemu) install_qemu_snp_experimental ;;
cc-snp-qemu) install_cc_snp_qemu_experimental ;;
cc-rootfs-image) install_cc_image ;;

36
tools/packaging/static-build/qemu/build-static-qemu-experimental-cc.sh Executable file
View File

@ -0,0 +1,36 @@
#!/usr/bin/env bash
#
# Copyright (c) 2022 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
set -o errexit
set -o nounset
set -o pipefail
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
source "${script_dir}/../../scripts/lib.sh"
qemu_repo="${qemu_repo:-}"
qemu_version="${qemu_version:-}"
qemu_suffix="${qemu_suffix:-experimental}"
tee="${tee:-}"
qemu_tarball_name="${qemu_tarball_name:-kata-static-qemu-experimental.tar.gz}"
export prefix="/opt/confidential-containers/"
if [ -z "${qemu_repo}" ]; then
info "Get qemu information from runtime versions.yaml"
export qemu_url=$(get_from_kata_deps "assets.hypervisor.qemu.url")
[ -n "${qemu_url}" ] || die "failed to get qemu url"
export qemu_repo="${qemu_url}.git"
fi
[ -n "${qemu_repo}" ] || die "failed to get qemu repo"
[ -n "${qemu_version}" ] || export qemu_version=$(get_from_kata_deps "assets.hypervisor.qemu.version")
[ -n "${qemu_version}" ] || die "failed to get qemu version"
qemu_tarball_name="kata-static-qemu-experimental-cc.tar.gz"
[ -n "${tee}" ] && qemu_tarball_name="kata-static-qemu-${tee}-experimental-cc.tar.gz"
"${script_dir}/build-base-qemu.sh" "${qemu_repo}" "${qemu_version}" "${qemu_suffix}" "${qemu_tarball_name}"