From c9bf7808b6345c7902c46ad11204fc076fb7b894 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 4 May 2023 11:01:05 +0200 Subject: [PATCH] cache: Update the KERNEL_FLAVOUR list to include nvidia-gpu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We need to make sure that, when caching a `-nvidia-gpu` kernel, we still look at the version of the base kernel used to build the nvidia-gpu drivers, as the ${vendor}-gpu kernels are based on already existing entries in the versions.yaml file and do not require a new entry to be added. Fixes: #6777 Signed-off-by: Fabiano Fidêncio --- .../static-build/cache_components_main.sh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/tools/packaging/static-build/cache_components_main.sh b/tools/packaging/static-build/cache_components_main.sh index 28e6bfacf..5c4b56d6e 100755 --- a/tools/packaging/static-build/cache_components_main.sh +++ b/tools/packaging/static-build/cache_components_main.sh @@ -12,7 +12,7 @@ script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" source "${script_dir}/../scripts/lib.sh" -KERNEL_FLAVOUR="${KERNEL_FLAVOUR:-kernel}" # kernel | kernel-experimental | kernel-arm-experimental | kernel-dragonball-experimental | kernel-tdx-experimental +KERNEL_FLAVOUR="${KERNEL_FLAVOUR:-kernel}" # kernel | kernel-nvidia-gpu | kernel-experimental | kernel-arm-experimental | kernel-dragonball-experimental | kernel-tdx-experimental | kernel-nvidia-gpu-tdx-experimental | kernel-nvidia-gpu-snp OVMF_FLAVOUR="${OVMF_FLAVOUR:-x86_64}" # x86_64 | tdx QEMU_FLAVOUR="${QEMU_FLAVOUR:-qemu}" # qemu | qemu-tdx-experimental | qemu-snp-experimental ROOTFS_IMAGE_TYPE="${ROOTFS_IMAGE_TYPE:-image}" # image | initrd @@ -36,6 +36,19 @@ cache_kernel_artifacts() { local current_kernel_version="$(get_from_kata_deps "assets.${KERNEL_FLAVOUR}.version")" local kernel_modules_tarball_path="${repo_root_dir}/tools/packaging/kata-deploy/local-build/build/kata-static-kernel-sev-modules.tar.xz" + # The ${vendor}-gpu kernels are based on an already existing entry, and does not require + # adding a new entry to the versions.yaml. + # + # With this in mind, let's just make sure we get the version from correct entry in the + # versions.yaml file. + case ${KERNEL_FLAVOUR} in + *"nvidia-gpu"*) + KERNEL_FLAVOUR=${KERNEL_FLAVOUR//"-nvidia-gpu"/} + ;; + *) + ;; + esac + if [[ "${KERNEL_FLAVOUR}" == "kernel-sev" ]]; then current_kernel_version="$(get_from_kata_deps "assets.kernel.sev.version")" fi @@ -130,7 +143,7 @@ Usage: $0 "[options]" -c Cloud hypervisor cache -F Firecracker cache -k Kernel cache - * Export KERNEL_FLAVOUR="kernel | kernel-experimental | kernel-arm-experimental | kernel-dragonball-experimental | kernel-tdx-experimental" for a specific build + * Export KERNEL_FLAVOUR="kernel | kernel-nvidia-gpu | kernel-experimental | kernel-arm-experimental | kernel-dragonball-experimental | kernel-tdx-experimental | kernel-nvidia-gpu-tdx-experimental | kernel-nvidia-gpu-snp" for a specific build The default KERNEL_FLAVOUR value is "kernel" -n Nydus cache -q QEMU cache