github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-12 05:12:37 +00:00
Code Issues Projects Releases Wiki Activity

local-build: cache: Consider os name & version for image/initrd

Browse Source 
Otherwise a bump in the os name and / or os version would lead to the CI
using a cached artefact.

Signed-off-by: Fabiano Fidêncio <fabiano@fidencio.org>
This commit is contained in:
Fabiano Fidêncio 2025-01-24 21:48:46 +01:00
parent 4a66acc6f5
commit c54f78bc6b
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
View File

@ -332,8 +332,12 @@ install_image() {
local variant="${1:-}" local variant="${1:-}"
image_type="image" image_type="image"
os_name="$(get_from_kata_deps ".assets.image.architecture.${ARCH}.name")"
os_version="$(get_from_kata_deps ".assets.image.architecture.${ARCH}.version")"
if [ -n "${variant}" ]; then if [ -n "${variant}" ]; then
image_type+="-${variant}" image_type+="-${variant}"
os_name="$(get_from_kata_deps ".assets.image.architecture.${ARCH}.${variant}.name")"
os_version="$(get_from_kata_deps ".assets.image.architecture.${ARCH}.${variant}.version")"
fi fi
local component="rootfs-${image_type}" local component="rootfs-${image_type}"
@ -349,7 +353,7 @@ install_image() {
"$(get_last_modification "${repo_root_dir}/tools/packaging/static-build/agent")") "$(get_last_modification "${repo_root_dir}/tools/packaging/static-build/agent")")
latest_artefact="$(get_kata_version)-${osbuilder_last_commit}-${guest_image_last_commit}-${agent_last_commit}-${libs_last_commit}-${gperf_version}-${libseccomp_version}-${rust_version}-${image_type}" latest_artefact="$(get_kata_version)-${os_name}-${os_version}-${osbuilder_last_commit}-${guest_image_last_commit}-${agent_last_commit}-${libs_last_commit}-${gperf_version}-${libseccomp_version}-${rust_version}-${image_type}"
if [ "${variant}" == "confidential" ]; then if [ "${variant}" == "confidential" ]; then
# For the confidential image we depend on the kernel built in order to ensure that # For the confidential image we depend on the kernel built in order to ensure that
# measured boot is used # measured boot is used
@ -371,16 +375,10 @@ install_image() {
info "Create image" info "Create image"
if [ -n "${variant}" ]; then if [ -n "${variant}" ]; then
os_name="$(get_from_kata_deps ".assets.image.architecture.${ARCH}.${variant}.name")"
os_version="$(get_from_kata_deps ".assets.image.architecture.${ARCH}.${variant}.version")"
if [[ "${variant}" == *confidential ]]; then if [[ "${variant}" == *confidential ]]; then
export COCO_GUEST_COMPONENTS_TARBALL="$(get_coco_guest_components_tarball_path)" export COCO_GUEST_COMPONENTS_TARBALL="$(get_coco_guest_components_tarball_path)"
export PAUSE_IMAGE_TARBALL="$(get_pause_image_tarball_path)" export PAUSE_IMAGE_TARBALL="$(get_pause_image_tarball_path)"
fi fi
else
os_name="$(get_from_kata_deps ".assets.image.architecture.${ARCH}.name")"
os_version="$(get_from_kata_deps ".assets.image.architecture.${ARCH}.version")"
fi fi
export AGENT_TARBALL=$(get_agent_tarball_path) export AGENT_TARBALL=$(get_agent_tarball_path)
@ -406,8 +404,12 @@ install_initrd() {
local variant="${1:-}" local variant="${1:-}"
initrd_type="initrd" initrd_type="initrd"
os_name="$(get_from_kata_deps ".assets.initrd.architecture.${ARCH}.name")"
os_version="$(get_from_kata_deps ".assets.initrd.architecture.${ARCH}.version")"
if [ -n "${variant}" ]; then if [ -n "${variant}" ]; then
initrd_type+="-${variant}" initrd_type+="-${variant}"
os_name="$(get_from_kata_deps ".assets.initrd.architecture.${ARCH}.${variant}.name")"
os_version="$(get_from_kata_deps ".assets.initrd.architecture.${ARCH}.${variant}.version")"
fi fi
local component="rootfs-${initrd_type}" local component="rootfs-${initrd_type}"
@ -422,7 +424,7 @@ install_initrd() {
"$(get_last_modification "${repo_root_dir}/src/agent")" \ "$(get_last_modification "${repo_root_dir}/src/agent")" \
"$(get_last_modification "${repo_root_dir}/tools/packaging/static-build/agent")") "$(get_last_modification "${repo_root_dir}/tools/packaging/static-build/agent")")
latest_artefact="${osbuilder_last_commit}-${guest_image_last_commit}-${agent_last_commit}-${libs_last_commit}-${gperf_version}-${libseccomp_version}-${rust_version}-${initrd_type}" latest_artefact="$(get_kata_version)-${os_name}-${os_version}-${osbuilder_last_commit}-${guest_image_last_commit}-${agent_last_commit}-${libs_last_commit}-${gperf_version}-${libseccomp_version}-${rust_version}-${initrd_type}"
if [ "${variant}" == "confidential" ]; then if [ "${variant}" == "confidential" ]; then
# For the confidential initrd we depend on the kernel built in order to ensure that # For the confidential initrd we depend on the kernel built in order to ensure that
# measured boot is used # measured boot is used
@ -446,17 +448,12 @@ install_initrd() {
info "Create initrd" info "Create initrd"
if [ -n "${variant}" ]; then if [ -n "${variant}" ]; then
os_name="$(get_from_kata_deps ".assets.initrd.architecture.${ARCH}.${variant}.name")"
os_version="$(get_from_kata_deps ".assets.initrd.architecture.${ARCH}.${variant}.version")"
if [[ "${variant}" == *confidential ]]; then if [[ "${variant}" == *confidential ]]; then
export COCO_GUEST_COMPONENTS_TARBALL="$(get_coco_guest_components_tarball_path)" export COCO_GUEST_COMPONENTS_TARBALL="$(get_coco_guest_components_tarball_path)"
export PAUSE_IMAGE_TARBALL="$(get_pause_image_tarball_path)" export PAUSE_IMAGE_TARBALL="$(get_pause_image_tarball_path)"
fi fi
else else
# No variant is passed, it means vanilla kata containers # No variant is passed, it means vanilla kata containers
os_name="$(get_from_kata_deps ".assets.initrd.architecture.${ARCH}.name")"
os_version="$(get_from_kata_deps ".assets.initrd.architecture.${ARCH}.version")"
if [ "${os_name}" = "alpine" ]; then if [ "${os_name}" = "alpine" ]; then
export AGENT_INIT=yes export AGENT_INIT=yes
fi fi