Merge pull request #6811 from fidencio/topic/yet-more-fixes-for-nvidia-gpu-kernels

cache: More fixes to nvidia-gpu kernels caching
This commit is contained in:
Fabiano Fidêncio
2023-05-12 10:02:08 +02:00
committed by GitHub
2 changed files with 11 additions and 5 deletions

View File

@@ -287,7 +287,7 @@ install_kernel_nvidia_gpu_tdx_experimental() {
install_kernel_helper \
"assets.kernel-tdx-experimental.version" \
"kernel-nvidia-gpu-tdx" \
"kernel-nvidia-gpu-tdx-experimental" \
"-x tdx -g nvidia -u ${kernel_url} -H deb"
}

View File

@@ -48,10 +48,16 @@ cache_kernel_artifacts() {
;;
esac
local current_kernel_version="$(get_from_kata_deps "assets.${KERNEL_FLAVOUR}.version")"
if [[ "${KERNEL_FLAVOUR}" == "kernel-sev" ]]; then
current_kernel_version="$(get_from_kata_deps "assets.kernel.sev.version")"
fi
case ${KERNEL_FLAVOUR} in
"kernel-sev"|"kernel-snp")
# In these cases, like "kernel-foo", it must be set to "kernel.foo" when looking at
# the versions.yaml file
current_kernel_version="$(get_from_kata_deps "assets.${KERNEL_FLAVOUR/-/.}.version")"
;;
*)
current_kernel_version="$(get_from_kata_deps "assets.${KERNEL_FLAVOUR}.version")"
;;
esac
create_cache_asset "${kernel_tarball_name}" "${current_kernel_version}-${current_kernel_kata_config_version}" "${current_kernel_image}"
if [[ "${KERNEL_FLAVOUR}" == "kernel-sev" ]]; then