From 3fa0890e5e372dcc8006bf81267d65ea65407ab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Sat, 15 Apr 2023 14:02:18 +0200 Subject: [PATCH] cache-components: Fix TDVF caching MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TDVF caching is not working as the tarball name is incorrect. The result expected is kata-static-tdvf.tar.xz, but it's looking for kata-static-tdx.tar.xz. This happens as a logic to convert tdx -> tdvf has been added as part of the building scripts, but I missed doing this as part of the caching scripts. Fixes: #6669 Signed-off-by: Fabiano Fidêncio --- tools/packaging/static-build/cache_components_main.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/packaging/static-build/cache_components_main.sh b/tools/packaging/static-build/cache_components_main.sh index 656a906d89..0e8a0120f8 100755 --- a/tools/packaging/static-build/cache_components_main.sh +++ b/tools/packaging/static-build/cache_components_main.sh @@ -44,8 +44,9 @@ cache_nydus_artifacts() { } cache_ovmf_artifacts() { - local ovmf_tarball_name="kata-static-${OVMF_FLAVOUR}.tar.xz" local current_ovmf_version="$(get_from_kata_deps "externals.ovmf.${OVMF_FLAVOUR}.version")" + [ "${OVMF_FLAVOUR}" == "tdx" ] && OVMF_FLAVOUR="tdvf" + local ovmf_tarball_name="kata-static-${OVMF_FLAVOUR}.tar.xz" local current_ovmf_image="$(get_ovmf_image_name)" create_cache_asset "${ovmf_tarball_name}" "${current_ovmf_version}" "${current_ovmf_image}" }