From a133fadbfafc7529b9e2da6aa194b0e406a5adff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 11 May 2023 20:19:49 +0200 Subject: [PATCH 1/2] cache: Fix nvidia-gpu-tdx-experimental cache URL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We were passing "kernel-nvidia-gpu-tdx", missing the "-experimental" part, leading to a non-valid URL. Signed-off-by: Fabiano Fidêncio --- tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh index 673b0c291..91828c53d 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -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" } From 4d17ea4a018d3aabba3642544564353a4ddd86f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 11 May 2023 21:26:58 +0200 Subject: [PATCH 2/2] cache: Fix nvidia-snp caching version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All the kernel-foo instances, such as "kernel-sev" or "kernel-snp", should be transformed into "kernel.foo" when looking at the versions.yaml file. This was already done for SEV, but missed on the SNP case. Fixes: #6777 Signed-off-by: Fabiano Fidêncio --- .../static-build/cache_components_main.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/packaging/static-build/cache_components_main.sh b/tools/packaging/static-build/cache_components_main.sh index 599a50f2c..ac9e3760b 100755 --- a/tools/packaging/static-build/cache_components_main.sh +++ b/tools/packaging/static-build/cache_components_main.sh @@ -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