github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-29 12:14:48 +00:00
Code Issues Projects Releases Wiki Activity

cache: Fix OVMF tarball name for different flavours

Browse Source 
75330ab3f9 tried to fix OVMF caching, but
didn't consider that the "vanilla" OVMF tarball name is not
"kata-static-ovmf-x86_64.tar.xz", but rather "kata-static-ovmf.tar.xz".

The fact we missed that, led to the cache builds of OVMF failing, and
the need to build the component on every single PR.

Fixes: #6917 (hopefully for good this time).

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio 2023-05-22 10:09:34 +02:00
parent b7341cd968
commit 22154e0a3b
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/packaging/static-build/cache_components_main.sh
View File

@ -77,8 +77,18 @@ cache_nydus_artifacts() {
cache_ovmf_artifacts() {
local current_ovmf_version="$(get_from_kata_deps "externals.ovmf.${OVMF_FLAVOUR}.version")"
local ovmf_tarball_name="kata-static-ovmf-${OVMF_FLAVOUR}.tar.xz"
[ "${OVMF_FLAVOUR}" == "tdx" ] && ovmf_tarball_name="kata-static-tdvf.tar.xz"
case ${OVMF_FLAVOUR} in
"tdx")
ovmf_tarball_name="kata-static-tdvf.tar.xz"
;;
"x86_64")
ovmf_tarball_name="kata-static-ovmf.tar.xz"
;;
*)
ovmf_tarball_name="kata-static-ovmf-${OVMF_FLAVOUR}.tar.xz"
;;
esac
local current_ovmf_image="$(get_ovmf_image_name)"
create_cache_asset "${ovmf_tarball_name}" "${current_ovmf_version}" "${current_ovmf_image}"
}