From 7aed8f8c80c3268a7073a8ca5ac6d8377ed4889f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 16 Mar 2023 12:45:20 +0100 Subject: [PATCH] tools: Add support for caching Nydus artefacts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's add support for caching Nydus artefacts that are generated using the kata-deploy local-build scripts. Right now those are not used, but we'll switch to using them very soon as part of upcoming changes of how we build the components we test in our CI. Fixes: #6480 Signed-off-by: Fabiano Fidêncio Signed-off-by: Gabriela Cervantes --- .../static-build/cache_components_main.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tools/packaging/static-build/cache_components_main.sh b/tools/packaging/static-build/cache_components_main.sh index 3f620887c..84ca73a0b 100755 --- a/tools/packaging/static-build/cache_components_main.sh +++ b/tools/packaging/static-build/cache_components_main.sh @@ -34,6 +34,12 @@ cache_kernel_artifacts() { create_cache_asset "${kernel_tarball_name}" "${current_kernel_version}" "${current_kernel_image}" } +cache_nydus_artifacts() { + local nydus_tarball_name="kata-static-nydus.tar.xz" + local current_nydus_version="$(get_from_kata_deps "externals.nydus.version")" + create_cache_asset "${nydus_tarball_name}" "${current_nydus_version}" "" +} + create_cache_asset() { local component_name="${1}" local component_version="${2}" @@ -60,6 +66,7 @@ Usage: $0 "[options]" -k Kernel cache * Export KERNEL_FLAVOUR="kernel|kernek-experimental|kernel-arm-experimental|kernel-dragonball-experimental" for a specific build The default KERNEL_FLAVOUR value is "kernel" + -n Nydus cache -h Shows help EOF )" @@ -69,8 +76,9 @@ main() { local cloud_hypervisor_component="${cloud_hypervisor_component:-}" local firecracker_component="${firecracker_component:-}" local kernel_component="${kernel_component:-}" + local nydus_component="${nydus_component:-}" local OPTIND - while getopts ":cFkh:" opt + while getopts ":cFknh:" opt do case "$opt" in c) @@ -82,6 +90,9 @@ main() { k) kernel_component="1" ;; + n) + nydus_component="1" + ;; h) help exit 0; @@ -98,6 +109,7 @@ main() { [[ -z "${cloud_hypervisor_component}" ]] && \ [[ -z "${firecracker_component}" ]] && \ [[ -z "${kernel_component}" ]] && \ + [[ -z "${nydus_component}" ]] && \ help && die "Must choose at least one option" mkdir -p "${WORKSPACE}/artifacts" @@ -107,6 +119,7 @@ main() { [ "${cloud_hypervisor_component}" == "1" ] && cache_clh_artifacts [ "${firecracker_component}" == "1" ] && cache_firecracker_artifacts [ "${kernel_component}" == "1" ] && cache_kernel_artifacts + [ "${nydus_component}" == "1" ] && cache_nydus_artifacts ls -la "${WORKSPACE}/artifacts/" popd