From 34e9c6ddab72ac9198b54ad05a6edf9f8dcf0431 Mon Sep 17 00:00:00 2001
From: Lorenzo Pagliai <lorenzo.pagliai@seco.com>
Date: Fri, 22 Mar 2024 13:32:51 +0100
Subject: [PATCH] [SHA] Insert SHA of the manifest in artifacts name

* Instead of inserting the "weekly" string in the artifacts name, which is
  already defined in the Azure path, we insert the short SHA for not
tagged version of Edgehog.
* Remove TAG_NAME variable from "latest" tagged artifacts
---
 build-pipeline.yml        | 10 ++++++++--
 scripts/artifacts_name.sh | 12 ++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/build-pipeline.yml b/build-pipeline.yml
index 8984a7d..98e870c 100644
--- a/build-pipeline.yml
+++ b/build-pipeline.yml
@@ -67,6 +67,7 @@ workflow:
     - |
       su secous -c "
       sh .gitlab-ci/scripts/build_setup.sh $GITBOT_TOKEN $CI_REPOSITORY_URL $BUILD_BRANCH $DEFCONFIG_FILE $RECIPE_NAME
+      git -C .repo/manifests rev-parse --short HEAD > $BASEDIR/commit_sha.txt
       . ./seco-setup.sh -d ${DEFCONFIG_FILE};
       . ./seco-setup.sh -c;
       sh ../.gitlab-ci/scripts/yocto_cache_setup.sh $PROCESSOR $NUM_MAX_CPU $CUSTOM;
@@ -98,6 +99,7 @@ workflow:
     paths:
       - $BUILD_DIRECTORY/$IMAGES_PATH/$MACHINE/
       - pathname.txt
+      - commit_sha.txt
       - kernel.txt
       - Job_build_report_${BOARD}_${IMAGE_NAME}.txt
       - Job_build_message_${BOARD}_${IMAGE_NAME}.txt
@@ -127,6 +129,7 @@ workflow:
     - ART_PATH=$(cat pathname.txt)
     - DEPLOY_DATE=$(date +%Y%m%d)
     - DEPLOY_PATH="${TAG_NAME}/week_$(date +%U)"
+    - TAG_SHA=$(cat commit_sha.txt)
     - |
        if [ -n "$CUSTOM" ]; then
           AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PRIVATE_SAS_TOKEN}"
@@ -134,6 +137,7 @@ workflow:
        fi
        if [ -n "$CI_COMMIT_TAG" ]; then
          TAG_NAME=${CI_COMMIT_TAG}
+         TAG_SHA=${TAG_NAME}
          DEPLOY_PATH=${TAG_NAME}
          if [ ! -n "$CUSTOM" ]; then
            AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
@@ -145,7 +149,7 @@ workflow:
     - |
       echo "Deploying software artifacts to Azure.."
       KERNEL=$(cat kernel.txt)
-      . .gitlab-ci/scripts/artifacts_name.sh $TAG_NAME $DEPLOY_DATE $KERNEL
+      . .gitlab-ci/scripts/artifacts_name.sh $TAG_SHA $DEPLOY_DATE $KERNEL
       echo $uboot_filename
       echo $kernel_filename
       echo $filesystem_name
@@ -167,12 +171,14 @@ workflow:
        fi
        DEPLOY_DATE=$(date +%Y%m%d)
        DEPLOY_PATH="${TAG_NAME}/week_$(date +%U)"
+       TAG_SHA=$(cat commit_sha.txt)
        if [ -n "$CUSTOM" ]; then
          AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PRIVATE_SAS_TOKEN}"
          AZURE_CONTAINER_NAME="${AZURE_PRIVATE_CONTAINER_NAME}"
        fi
        if [ -n "$CI_COMMIT_TAG" ]; then
          TAG_NAME=${CI_COMMIT_TAG}
+         TAG_SHA=${TAG_NAME}
          DEPLOY_PATH=${TAG_NAME}
          if [ ! -n "$CUSTOM" ]; then
            AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
@@ -185,7 +191,7 @@ workflow:
     - |
        echo "Deploying software artifacts to Azure.."
        KERNEL=$(cat kernel.txt)
-       . .gitlab-ci/scripts/artifacts_name.sh $TAG_NAME $DEPLOY_DATE $KERNEL
+       . .gitlab-ci/scripts/artifacts_name.sh $TAG_SHA $DEPLOY_DATE $KERNEL
     - sh .gitlab-ci/scripts/generate_report.sh $DEPLOY_PATH  $AZURE_STORAGE_SAS_TOKEN  $AZURE_CONTAINER_NAME $AZURE_PATH
 
   allow_failure: true
diff --git a/scripts/artifacts_name.sh b/scripts/artifacts_name.sh
index 939fea7..5f143a7 100644
--- a/scripts/artifacts_name.sh
+++ b/scripts/artifacts_name.sh
@@ -12,14 +12,14 @@ else
 fi
 
 export uboot_filename="seco_"$PROCESSOR""$board_suffix"_uboot-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.gz"
-export uboot_filename_latest="seco_"$PROCESSOR""$board_suffix"_uboot-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest.tar.gz"
+export uboot_filename_latest="seco_"$PROCESSOR""$board_suffix"_uboot-"$IMAGE_NAME"_"$KERNEL"_latest.tar.gz"
 export kernel_filename="seco_"$PROCESSOR""$board_suffix"_kernel-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.gz"
-export kernel_filename_latest="seco_"$PROCESSOR""$board_suffix"_kernel-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest.tar.gz"
+export kernel_filename_latest="seco_"$PROCESSOR""$board_suffix"_kernel-"$IMAGE_NAME"_"$KERNEL"_latest.tar.gz"
 export filesystem_name="seco_"$PROCESSOR""$board_suffix"_filesystem-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.bz2"
-export filesystem_name_latest="seco_"$PROCESSOR""$board_suffix"_filesystem-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest.tar.bz2"
+export filesystem_name_latest="seco_"$PROCESSOR""$board_suffix"_filesystem-"$IMAGE_NAME"_"$KERNEL"_latest.tar.bz2"
 export image_name="seco_"$PROCESSOR""$board_suffix"_"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE"."$IMAGE_EXTENSION""
-export image_name_latest="seco_"$PROCESSOR""$board_suffix"_"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest."$IMAGE_EXTENSION""
+export image_name_latest="seco_"$PROCESSOR""$board_suffix"_"$IMAGE_NAME"_"$KERNEL"_latest."$IMAGE_EXTENSION""
 export bmap_name="seco_"$PROCESSOR""$board_suffix"_bmapfile-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".rootfs.wic.bmap"
-export bmap_name_latest="seco_"$PROCESSOR""$board_suffix"_bmapfile-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest.rootfs.wic.bmap"
+export bmap_name_latest="seco_"$PROCESSOR""$board_suffix"_bmapfile-"$IMAGE_NAME"_"$KERNEL"_latest.rootfs.wic.bmap"
 export bundle_filename="seco_"$PROCESSOR""$board_suffix"_edgehog-bundle_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".raucb"
-export bundle_filename_latest="seco_"$PROCESSOR""$board_suffix"_edgehog-bundle_"$KERNEL"_"$TAG_NAME"_latest.raucb"
\ No newline at end of file
+export bundle_filename_latest="seco_"$PROCESSOR""$board_suffix"_edgehog-bundle_"$KERNEL"_latest.raucb"
\ No newline at end of file
-- 
GitLab