From f27f29d8b8b314d10c9ea19aa1e82cc276445723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 19 May 2023 15:18:50 +0200 Subject: [PATCH] local-build: Bring back root_hash logic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I cannot easily pin-point which commit dropped it, but my gut feeling is that it's the result of an erroneous conflict resolution when merging content from main to the CCv0 branch. Regardless of when / why it happened, as the root_hash logic ended up being dropped, workflows that depend on that are now failing. With everything said in mind, let's bring the logic back. Fixes: #6901 Signed-off-by: Fabiano Fidêncio --- .../kata-deploy/local-build/kata-deploy-binaries.sh | 8 ++++++++ 1 file changed, 8 insertions(+) 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 13cddc3b14..7f7d791b80 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -148,6 +148,14 @@ install_cached_component() { wget "${jenkins_build_url}/${component_tarball_name}" || return $(cleanup_and_fail) wget "${jenkins_build_url}/sha256sum-${component_tarball_name}" || return $(cleanup_and_fail) sha256sum -c "sha256sum-${component_tarball_name}" || return $(cleanup_and_fail) + if [ -n "${root_hash_vanilla}" ]; then + wget "${jenkins_build_url}/${root_hash_vanilla}" || return cleanup_and_fail + mv "${root_hash_vanilla}" "${repo_root_dir}/tools/osbuilder/" + fi + if [ -n "${root_hash_tdx}" ]; then + wget "${jenkins_build_url}/${root_hash_tdx}" || return cleanup_and_fail + mv "${root_hash_tdx}" "${repo_root_dir}/tools/osbuilder/" + fi mv "${component_tarball_name}" "${component_tarball_path}" }