github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-05 02:40:18 +00:00
Code Issues Projects Releases Wiki Activity

cc: cache: shim-v2: Allow root_hashes to be downloaded

Browse Source 
We should not return, in case cache is not used, before actually
downloading the root_hash_*.txt provided by the other components,
otherwise the job used to do the caching will always fail.

Fixes: #7422

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio
2023-07-25 13:51:25 +02:00
parent 7f1226ae2b
commit 2213660bf3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -175,10 +175,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 +218,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}" \