From d46b6a3879aeb1ac06798b5ffbc6c85e858edeae Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Tue, 21 May 2024 11:24:51 +0100 Subject: [PATCH] ci: cache: Add arch suffix to all cache tags As we have multi-arch builds for nearly all components, we want to ensure that all the cache tags we set have the architecture suffix, not just the `TARGET_BRANCH` one. Signed-off-by: stevenhorsman --- .../packaging/kata-deploy/local-build/kata-deploy-binaries.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 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 fe3279690c..39c305fee1 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -1137,7 +1137,7 @@ handle_build() { echo "${ARTEFACT_REGISTRY_PASSWORD}" | sudo oras login "${ARTEFACT_REGISTRY}" -u "${ARTEFACT_REGISTRY_USERNAME}" --password-stdin - tags=(latest-${TARGET_BRANCH}-$(uname -m)) + tags=(latest-"${TARGET_BRANCH}") if [ -n "${artefact_tag:-}" ]; then tags+=("${artefact_tag}") fi @@ -1150,7 +1150,7 @@ handle_build() { for tag in "${tags[@]}"; do # tags can only contain lowercase and uppercase letters, digits, underscores, periods, and hyphens, so # filter out non-printable characers and then replace invalid printable characters with underscode - tag=("$(echo ${tag} | tr -dc '[:print:]' | tr -c '[a-zA-Z0-9\_\.\-]' _)") + tag=("$(echo ${tag} | tr -dc '[:print:]' | tr -c '[a-zA-Z0-9\_\.\-]' _)-$(uname -m)") case ${build_target} in kernel-nvidia-gpu) sudo oras push \