github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-22 09:49:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7443 from fidencio/topic/CCv0-converge-build-and-payload-scripts-follow-up-3

Browse Source 
CC| cc: cache: Enable more cached components back and ensure shim-v2 can be properly cached
This commit is contained in:
Fabiano Fidêncio 2023-07-25 20:32:02 +02:00 committed by GitHub
commit ce926439f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,12 +124,6 @@ cleanup_and_fail() {
} }
install_cached_tarball_component() { install_cached_tarball_component() {
case ${5} in
"kata-static-cc-rootfs-image.tar.xz" | "kata-static-cc-rootfs-initrd.tar.xz" | "kata-static-cc-se-image.tar.xz" | "kata-static-cc-tdx-rootfs-image.tar.xz" | "kata-static-cc-tdx-td-shim.tar.xz" | "kata-static-cc-sev-rootfs-initrd.tar.xz" )
USE_CACHE="no"
;;
esac
if [ "${USE_CACHE}" != "yes" ]; then if [ "${USE_CACHE}" != "yes" ]; then
return 1 return 1
fi fi
@ -175,10 +169,6 @@ install_cached_cc_shim_v2() {
;; ;;
esac esac
if [ "${USE_CACHE}" != "yes" ]; then
return 1
fi
local component="${1}" local component="${1}"
local jenkins_build_url="${2}" local jenkins_build_url="${2}"
local current_version="${3}" local current_version="${3}"
@ -222,6 +212,10 @@ install_cached_cc_shim_v2() {
wget "${jenkins_build_url}/root_hash_tdx.txt" -O "shim_v2_root_hash_tdx.txt" || return 1 wget "${jenkins_build_url}/root_hash_tdx.txt" -O "shim_v2_root_hash_tdx.txt" || return 1
diff "${root_hash_tdx}" "shim_v2_root_hash_tdx.txt" > /dev/null || return 1 diff "${root_hash_tdx}" "shim_v2_root_hash_tdx.txt" > /dev/null || return 1
if [ "${USE_CACHE}" != "yes" ]; then
return 1
fi
install_cached_tarball_component \ install_cached_tarball_component \
"${component}" \ "${component}" \
"${jenkins_build_url}" \ "${jenkins_build_url}" \