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

Merge pull request #5823 from fidencio/topic/cached-components-fix-clh-tarball-name

Browse Source 
CC | packaging: Fix the cloud hypervisor cached logic
This commit is contained in:
Fabiano Fidêncio 2022-12-02 15:43:58 +01:00 committed by GitHub
commit d910a79a3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/packaging/kata-deploy/local-build/Makefile
View File

@ -121,9 +121,6 @@ cc-shim-v2-tarball:
cc-virtiofsd-tarball: cc-virtiofsd-tarball:
${MAKE} $@-build ${MAKE} $@-build
cc-tdx-cloud-hypervisor-tarball:
${MAKE} $@-build
cc-tdx-kernel-tarball: cc-tdx-kernel-tarball:
${MAKE} $@-build ${MAKE} $@-build

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

@ -130,7 +130,7 @@ install_cached_component() {
echo "Downloading tarball from: ${jenkins_build_url}/${component_tarball_name}" echo "Downloading tarball from: ${jenkins_build_url}/${component_tarball_name}"
curl -fL --progress-bar "${jenkins_build_url}/${component_tarball_name}" -o "${component_tarball_path}" || return cleanup_and_fail curl -fL --progress-bar "${jenkins_build_url}/${component_tarball_name}" -o "${component_tarball_path}" || return cleanup_and_fail
curl -fsOL "${jenkins_build_url}/sha256sum-${component_tarball_name}" || return cleanup_and_fail curl -fsOL "${jenkins_build_url}/sha256sum-${component_tarball_name}" || return cleanup_and_fail
sha256sum -c "sha256sum-${component_tarball_name}" && return cleanup_and_fail sha256sum -c "sha256sum-${component_tarball_name}" || return cleanup_and_fail
popd popd
} }
@ -253,11 +253,6 @@ install_cc_virtiofsd() {
sudo install -D --owner root --group root --mode 0744 virtiofsd/virtiofsd "${destdir}/${cc_prefix}/libexec/virtiofsd" sudo install -D --owner root --group root --mode 0744 virtiofsd/virtiofsd "${destdir}/${cc_prefix}/libexec/virtiofsd"
} }
# Install static CC cloud-hypervisor asset
install_tdx_cc_clh() {
install_cc_clh
}
#Install CC kernel assert, with TEE support #Install CC kernel assert, with TEE support
install_cc_tee_kernel() { install_cc_tee_kernel() {
tee="${1}" tee="${1}"
@ -343,7 +338,7 @@ install_cc_tee_ovmf() {
install_cached_component \ install_cached_component \
"${component_name}" \ "${component_name}" \
"${jenkins_url}/job/kata-containers-2.0-${component_name}-cc-$(uname -m)/${cached_artifacts_path}" \ "${jenkins_url}/job/kata-containers-2.0-${component_name}-cc-$(uname -m)/${cached_artifacts_path}" \
"$(component_version)" \ "${component_version}" \
"$(get_ovmf_image_name)" \ "$(get_ovmf_image_name)" \
"${final_tarball_name}" \ "${final_tarball_name}" \
"${final_tarball_path}" \ "${final_tarball_path}" \
@ -503,8 +498,6 @@ handle_build() {
cc-virtiofsd) install_cc_virtiofsd ;; cc-virtiofsd) install_cc_virtiofsd ;;
cc-tdx-cloud-hypervisor) install_tdx_cc_clh ;;
cc-tdx-kernel) install_cc_tdx_kernel ;; cc-tdx-kernel) install_cc_tdx_kernel ;;
cc-sev-kernel) install_cc_sev_kernel ;; cc-sev-kernel) install_cc_sev_kernel ;;

10
tools/packaging/static-build/cache_components.sh
View File

@ -20,18 +20,18 @@ cache_qemu_artifacts() {
local current_qemu_version=$(get_from_kata_deps "assets.hypervisor.qemu.version") local current_qemu_version=$(get_from_kata_deps "assets.hypervisor.qemu.version")
if [ -n "${TEE}" ]; then if [ -n "${TEE}" ]; then
qemu_tarball_name="kata-static-cc-${TEE}-qemu.tar.xz" qemu_tarball_name="kata-static-cc-${TEE}-qemu.tar.xz"
[ "${TEE}" == "tdx" ] && current_qemu_version=$(get_from_kata_deps "asserts.hypervisor.qemu.tdx.tag") [ "${TEE}" == "tdx" ] && current_qemu_version=$(get_from_kata_deps "assets.hypervisor.qemu.tdx.tag")
fi fi
local qemu_script_dir="${repo_root_dir}/tools/packaging/static-build/qemu" local qemu_script_dir="${repo_root_dir}/tools/packaging/static-build/qemu"
local qemu_sha=$(calc_qemu_files_sha256sum) local qemu_sha=$(calc_qemu_files_sha256sum)
local current_qemu_image="$(get_qemu_image_name)" local current_qemu_image="$(get_qemu_image_name)"
create_cache_asset "${qemu_tarball_name}" "${current_qemu_version}-${qemu_sha}" "${current_qemu_image}" create_cache_asset "${qemu_tarball_name}" "${current_qemu_version}-${qemu_sha}" "${current_qemu_image}"
} }
cache_clh_artifacts() { cache_clh_artifacts() {
local clh_tarball_name="kata-static-cc-clh.tar.xz" local clh_tarball_name="kata-static-cc-cloud-hypervisor.tar.xz"
[ -n "${TEE}" ] && clh_tarball_name="kata-static-cc-tdx-clh.tar.xz" local current_clh_version=$(get_from_kata_deps "assets.hypervisor.cloud_hypervisor.version")
local current_clh_version=$(get_from_kata_deps "assets.cloud-hypervisor.version")
create_cache_asset "${clh_tarball_name}" "${current_clh_version}" "" create_cache_asset "${clh_tarball_name}" "${current_clh_version}" ""
} }
@ -40,7 +40,7 @@ cache_kernel_artifacts() {
local current_kernel_image="$(get_kernel_image_name)" local current_kernel_image="$(get_kernel_image_name)"
local current_kernel_version="$(get_from_kata_deps "assets.kernel.version")" local current_kernel_version="$(get_from_kata_deps "assets.kernel.version")"
if [ -n "${TEE}" ]; then if [ -n "${TEE}" ]; then
kernel_tarball_name="kata-stastic-cc-${TEE}-kernel.tar.xz" kernel_tarball_name="kata-static-cc-${TEE}-kernel.tar.xz"
[ "${TEE}" == "tdx" ] && current_kernel_version="$(get_from_kata_deps "assets.kernel.${TEE}.tag")" [ "${TEE}" == "tdx" ] && current_kernel_version="$(get_from_kata_deps "assets.kernel.${TEE}.tag")"
[ "${TEE}" == "sev" ] && current_kernel_version="$(get_from_kata_deps "assets.kernel.${TEE}.version")" [ "${TEE}" == "sev" ] && current_kernel_version="$(get_from_kata_deps "assets.kernel.${TEE}.version")"
fi fi