From 9c75d43aefc1e421db308a47b48ae0e79cc12938 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Mon, 16 Jan 2023 16:44:17 +0000 Subject: [PATCH] kata-deploy: Update cache version - Remove skopeo & umoci from cache version now they aren't built into the rootfs image Fixes: #3970 Signed-off-by: stevenhorsman --- .../packaging/kata-deploy/local-build/kata-deploy-binaries.sh | 4 +--- tools/packaging/static-build/cache_components.sh | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) 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 608631912a..5dd3f0968a 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -253,14 +253,12 @@ install_cc_image() { local gperf_version="$(get_from_kata_deps "externals.gperf.version")" local libseccomp_version="$(get_from_kata_deps "externals.libseccomp.version")" local pause_version="$(get_from_kata_deps "externals.pause.version")" - local skopeo_version="$(get_from_kata_deps "externals.skopeo.branch")" - local umoci_version="$(get_from_kata_deps "externals.umoci.tag")" local rust_version="$(get_from_kata_deps "languages.rust.meta.newest-version")" install_cached_component \ "${component}" \ "${jenkins}" \ - "${osbuilder_last_commit}-${guest_image_last_commit}-${agent_last_commit}-${libs_last_commit}-${attestation_agent_version}-${gperf_version}-${libseccomp_version}-${pause_version}-${skopeo_version}-${umoci_version}-${rust_version}-${image_type}-${AA_KBC}" \ + "${osbuilder_last_commit}-${guest_image_last_commit}-${agent_last_commit}-${libs_last_commit}-${attestation_agent_version}-${gperf_version}-${libseccomp_version}-${pause_version}-${rust_version}-${image_type}-${AA_KBC}" \ "" \ "${final_tarball_name}" \ "${final_tarball_path}" \ diff --git a/tools/packaging/static-build/cache_components.sh b/tools/packaging/static-build/cache_components.sh index 193cf07c55..37d48b37dd 100755 --- a/tools/packaging/static-build/cache_components.sh +++ b/tools/packaging/static-build/cache_components.sh @@ -84,8 +84,6 @@ cache_rootfs_artifacts() { local gperf_version="$(get_from_kata_deps "externals.gperf.version")" local libseccomp_version="$(get_from_kata_deps "externals.libseccomp.version")" local pause_version="$(get_from_kata_deps "externals.pause.version")" - local skopeo_version="$(get_from_kata_deps "externals.skopeo.branch")" - local umoci_version="$(get_from_kata_deps "externals.umoci.tag")" local rust_version="$(get_from_kata_deps "languages.rust.meta.newest-version")" local rootfs_tarball_name="kata-static-cc-rootfs-image.tar.xz" local aa_kbc="offline_fs_kbc" @@ -101,7 +99,7 @@ cache_rootfs_artifacts() { root_hash_tdx="${repo_root_dir}/tools/osbuilder/root_hash_tdx.txt" fi fi - local current_rootfs_version="${osbuilder_last_commit}-${guest_image_last_commit}-${agent_last_commit}-${libs_last_commit}-${attestation_agent_version}-${gperf_version}-${libseccomp_version}-${pause_version}-${skopeo_version}-${umoci_version}-${rust_version}-${image_type}-${aa_kbc}" + local current_rootfs_version="${osbuilder_last_commit}-${guest_image_last_commit}-${agent_last_commit}-${libs_last_commit}-${attestation_agent_version}-${gperf_version}-${libseccomp_version}-${pause_version}-${rust_version}-${image_type}-${aa_kbc}" create_cache_asset "${rootfs_tarball_name}" "${current_rootfs_version}" "" "${root_hash_vanilla}" "${root_hash_tdx}" }