Merge pull request #6918 from fidencio/topic/fix-cache-x86_64-ovmf-rootfs-initrd

Fix cache for OVMF and rootfs-initrd (both x86_64)
This commit is contained in:
Fabiano Fidêncio
2023-05-22 21:34:56 +02:00
committed by GitHub
2 changed files with 13 additions and 3 deletions

View File

@@ -159,7 +159,7 @@ install_image() {
#Install guest initrd
install_initrd() {
local initrd_type="${1:-""}"
local initrd_type="${1:-"initrd"}"
local initrd_suffix="${2:-""}"
local jenkins="${jenkins_url}/job/kata-containers-main-rootfs-${initrd_type}-$(uname -m)/${cached_artifacts_path}"
local component="rootfs-${initrd_type}"

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}"
}