From 80e3a2d408c81757e03574723088587bf2950ee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Sat, 15 Apr 2023 13:27:34 +0200 Subject: [PATCH] cache-components: Fix TDX QEMU caching MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TDX QEMU caching is not working as expected, as we're checking for its version looking at "assets.hypervisor.${QEMU_FLAVOUR}.version", which is correct for standard QEMU. However, for TDX QEMU we should be checking for "assets.hypervisor.${QEMU_FLAVOUR}.tag" Fixes: #6668 Signed-off-by: Fabiano Fidêncio --- tools/packaging/static-build/cache_components_main.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/packaging/static-build/cache_components_main.sh b/tools/packaging/static-build/cache_components_main.sh index 804df1cbf4..656a906d89 100755 --- a/tools/packaging/static-build/cache_components_main.sh +++ b/tools/packaging/static-build/cache_components_main.sh @@ -53,6 +53,7 @@ cache_ovmf_artifacts() { cache_qemu_artifacts() { local qemu_tarball_name="kata-static-${QEMU_FLAVOUR}.tar.xz" local current_qemu_version=$(get_from_kata_deps "assets.hypervisor.${QEMU_FLAVOUR}.version") + [ -z "${current_qemu_version}" ] && current_qemu_version=$(get_from_kata_deps "assets.hypervisor.${QEMU_FLAVOUR}.tag") local qemu_sha=$(calc_qemu_files_sha256sum) local current_qemu_image="$(get_qemu_image_name)" create_cache_asset "${qemu_tarball_name}" "${current_qemu_version}-${qemu_sha}" "${current_qemu_image}"