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

cache: Update the KERNEL_FLAVOUR list to include nvidia-gpu

Browse Source 
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 <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio 2023-05-04 11:01:05 +02:00
parent 3665b42045
commit c9bf7808b6
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@ script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
source "${script_dir}/../scripts/lib.sh" 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 OVMF_FLAVOUR="${OVMF_FLAVOUR:-x86_64}" # x86_64 | tdx
QEMU_FLAVOUR="${QEMU_FLAVOUR:-qemu}" # qemu | qemu-tdx-experimental | qemu-snp-experimental QEMU_FLAVOUR="${QEMU_FLAVOUR:-qemu}" # qemu | qemu-tdx-experimental | qemu-snp-experimental
ROOTFS_IMAGE_TYPE="${ROOTFS_IMAGE_TYPE:-image}" # image | initrd 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 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" 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 if [[ "${KERNEL_FLAVOUR}" == "kernel-sev" ]]; then
current_kernel_version="$(get_from_kata_deps "assets.kernel.sev.version")" current_kernel_version="$(get_from_kata_deps "assets.kernel.sev.version")"
fi fi
@ -130,7 +143,7 @@ Usage: $0 "[options]"
-c Cloud hypervisor cache -c Cloud hypervisor cache
-F Firecracker cache -F Firecracker cache
-k Kernel 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" The default KERNEL_FLAVOUR value is "kernel"
-n Nydus cache -n Nydus cache
-q QEMU cache -q QEMU cache