From d03685004ef2e9260d805a43c53bbd00187939ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 25 Jul 2023 10:23:03 +0200 Subject: [PATCH] cc: tdvf: Ensure we try the cache for the specific CC version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise we'd have to build the component every single time as the main version is different from the CC one. Signed-off-by: Fabiano Fidêncio --- .../kata-deploy/local-build/kata-deploy-binaries.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 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 7fdea96bcc..847785fa51 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -788,9 +788,20 @@ install_ovmf() { local component_name="ovmf" local component_version="$(get_from_kata_deps "externals.ovmf.${ovmf_type}.version")" [ "${ovmf_type}" == "tdx" ] && component_name="tdvf" + + # I am not expanding the if above just to make it easier for us in the + # future to deal with the rebases + # + # This must only be done as part of the CCv0 branch, as the version of + # TDVF is not the same as the one used on main + local url="${jenkins_url}/job/kata-containers-main-ovmf-${ovmf_type}-$(uname -m)/${cached_artifacts_path}" + if [[ "${ovmf_type}" == "tdx" ]]; then + url="${jenkins_url}/job/kata-containers-2.0-tdvf-cc-$(uname -m)/${cached_artifacts_path}" + fi + install_cached_tarball_component \ "${component_name}" \ - "${jenkins_url}/job/kata-containers-main-ovmf-${ovmf_type}-$(uname -m)/${cached_artifacts_path}" \ + "${url}" \ "${component_version}" \ "$(get_ovmf_image_name)" \ "${final_tarball_name}" \