Merge pull request #9650 from stevenhorsman/caching-tagging-update-partIII

Caching tagging update part iii
This commit is contained in:
Steve Horsman
2024-05-17 09:09:15 +01:00
committed by GitHub

View File

@@ -1137,45 +1137,6 @@ handle_build() {
echo "${ARTEFACT_REGISTRY_PASSWORD}" | sudo oras login "${ARTEFACT_REGISTRY}" -u "${ARTEFACT_REGISTRY_USERNAME}" --password-stdin echo "${ARTEFACT_REGISTRY_PASSWORD}" | sudo oras login "${ARTEFACT_REGISTRY}" -u "${ARTEFACT_REGISTRY_USERNAME}" --password-stdin
case ${build_target} in
kernel-nvidia-gpu)
sudo oras push \
${ARTEFACT_REGISTRY}/kata-containers/cached-artefacts/${build_target}:latest-${TARGET_BRANCH}-$(uname -m) \
${final_tarball_name} \
"kata-static-${build_target}-headers.tar.xz" \
${build_target}-version \
${build_target}-builder-image-version \
${build_target}-sha256sum
;;
kernel-nvidia-gpu-confidential)
sudo oras push \
${ARTEFACT_REGISTRY}/${ARTEFACT_REPOSITORY}/cached-artefacts/${build_target}:latest-${TARGET_BRANCH}-$(uname -m) \
${final_tarball_name} \
"kata-static-${build_target}-modules.tar.xz" \
"kata-static-${build_target}-headers.tar.xz" \
${build_target}-version \
${build_target}-builder-image-version \
${build_target}-sha256sum
;;
kernel*-confidential)
sudo oras push \
${ARTEFACT_REGISTRY}/${ARTEFACT_REPOSITORY}/cached-artefacts/${build_target}:latest-${TARGET_BRANCH}-$(uname -m) \
${final_tarball_name} \
"kata-static-${build_target}-modules.tar.xz" \
${build_target}-version \
${build_target}-builder-image-version \
${build_target}-sha256sum
;;
*)
sudo oras push \
${ARTEFACT_REGISTRY}/${ARTEFACT_REPOSITORY}/cached-artefacts/${build_target}:latest-${TARGET_BRANCH}-$(uname -m) \
${final_tarball_name} \
${build_target}-version \
${build_target}-builder-image-version \
${build_target}-sha256sum
;;
esac
tags=(latest-${TARGET_BRANCH}-$(uname -m)) tags=(latest-${TARGET_BRANCH}-$(uname -m))
if [ -n "${artefact_tag:-}" ]; then if [ -n "${artefact_tag:-}" ]; then
tags+=("${artefact_tag}") tags+=("${artefact_tag}")
@@ -1184,12 +1145,35 @@ handle_build() {
tags+=("$(cat "${version_file}")") tags+=("$(cat "${version_file}")")
fi fi
echo "Pushing ${build_target} with tags: ${tags[*]}"
for tag in "${tags[@]}"; do for tag in "${tags[@]}"; do
# tags can only contain lowercase and uppercase letters, digits, underscores, periods, and hyphens
tag=("$(echo ${tag} | tr -c '[a-zA-Z0-9\_\.\-]' _)")
case ${build_target} in case ${build_target} in
kernel*-confidential) kernel-nvidia-gpu)
sudo oras push \ sudo oras push \
${ARTEFACT_REGISTRY}/kata-containers/cached-artefacts/${build_target}:${tag} \ ${ARTEFACT_REGISTRY}/kata-containers/cached-artefacts/${build_target}:${tag} \
${final_tarball_name} \ ${final_tarball_name} \
"kata-static-${build_target}-headers.tar.xz" \
${build_target}-version \
${build_target}-builder-image-version \
${build_target}-sha256sum
;;
kernel-nvidia-gpu-confidential)
sudo oras push \
${ARTEFACT_REGISTRY}/${ARTEFACT_REPOSITORY}/cached-artefacts/${build_target}:${tag} \
${final_tarball_name} \
"kata-static-${build_target}-modules.tar.xz" \
"kata-static-${build_target}-headers.tar.xz" \
${build_target}-version \
${build_target}-builder-image-version \
${build_target}-sha256sum
;;
kernel*-confidential)
sudo oras push \
${ARTEFACT_REGISTRY}/${ARTEFACT_REPOSITORY}/cached-artefacts/${build_target}:${tag} \
${final_tarball_name} \
"kata-static-${build_target}-modules.tar.xz" \ "kata-static-${build_target}-modules.tar.xz" \
${build_target}-version \ ${build_target}-version \
${build_target}-builder-image-version \ ${build_target}-builder-image-version \
@@ -1197,7 +1181,7 @@ handle_build() {
;; ;;
*) *)
sudo oras push \ sudo oras push \
${ARTEFACT_REGISTRY}/kata-containers/cached-artefacts/${build_target}:${tag} \ ${ARTEFACT_REGISTRY}/${ARTEFACT_REPOSITORY}/cached-artefacts/${build_target}:${tag} \
${final_tarball_name} \ ${final_tarball_name} \
${build_target}-version \ ${build_target}-version \
${build_target}-builder-image-version \ ${build_target}-builder-image-version \