Skip to content
Snippets Groups Projects
Commit 34e9c6dd authored by Lorenzo Pagliai's avatar Lorenzo Pagliai
Browse files

[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
parent b8dd7a1d
No related branches found
No related tags found
No related merge requests found
...@@ -67,6 +67,7 @@ workflow: ...@@ -67,6 +67,7 @@ workflow:
- | - |
su secous -c " su secous -c "
sh .gitlab-ci/scripts/build_setup.sh $GITBOT_TOKEN $CI_REPOSITORY_URL $BUILD_BRANCH $DEFCONFIG_FILE $RECIPE_NAME 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 -d ${DEFCONFIG_FILE};
. ./seco-setup.sh -c; . ./seco-setup.sh -c;
sh ../.gitlab-ci/scripts/yocto_cache_setup.sh $PROCESSOR $NUM_MAX_CPU $CUSTOM; sh ../.gitlab-ci/scripts/yocto_cache_setup.sh $PROCESSOR $NUM_MAX_CPU $CUSTOM;
...@@ -98,6 +99,7 @@ workflow: ...@@ -98,6 +99,7 @@ workflow:
paths: paths:
- $BUILD_DIRECTORY/$IMAGES_PATH/$MACHINE/ - $BUILD_DIRECTORY/$IMAGES_PATH/$MACHINE/
- pathname.txt - pathname.txt
- commit_sha.txt
- kernel.txt - kernel.txt
- Job_build_report_${BOARD}_${IMAGE_NAME}.txt - Job_build_report_${BOARD}_${IMAGE_NAME}.txt
- Job_build_message_${BOARD}_${IMAGE_NAME}.txt - Job_build_message_${BOARD}_${IMAGE_NAME}.txt
...@@ -127,6 +129,7 @@ workflow: ...@@ -127,6 +129,7 @@ workflow:
- ART_PATH=$(cat pathname.txt) - ART_PATH=$(cat pathname.txt)
- DEPLOY_DATE=$(date +%Y%m%d) - DEPLOY_DATE=$(date +%Y%m%d)
- DEPLOY_PATH="${TAG_NAME}/week_$(date +%U)" - DEPLOY_PATH="${TAG_NAME}/week_$(date +%U)"
- TAG_SHA=$(cat commit_sha.txt)
- | - |
if [ -n "$CUSTOM" ]; then if [ -n "$CUSTOM" ]; then
AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PRIVATE_SAS_TOKEN}" AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PRIVATE_SAS_TOKEN}"
...@@ -134,6 +137,7 @@ workflow: ...@@ -134,6 +137,7 @@ workflow:
fi fi
if [ -n "$CI_COMMIT_TAG" ]; then if [ -n "$CI_COMMIT_TAG" ]; then
TAG_NAME=${CI_COMMIT_TAG} TAG_NAME=${CI_COMMIT_TAG}
TAG_SHA=${TAG_NAME}
DEPLOY_PATH=${TAG_NAME} DEPLOY_PATH=${TAG_NAME}
if [ ! -n "$CUSTOM" ]; then if [ ! -n "$CUSTOM" ]; then
AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}" AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
...@@ -145,7 +149,7 @@ workflow: ...@@ -145,7 +149,7 @@ workflow:
- | - |
echo "Deploying software artifacts to Azure.." echo "Deploying software artifacts to Azure.."
KERNEL=$(cat kernel.txt) 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 $uboot_filename
echo $kernel_filename echo $kernel_filename
echo $filesystem_name echo $filesystem_name
...@@ -167,12 +171,14 @@ workflow: ...@@ -167,12 +171,14 @@ workflow:
fi fi
DEPLOY_DATE=$(date +%Y%m%d) DEPLOY_DATE=$(date +%Y%m%d)
DEPLOY_PATH="${TAG_NAME}/week_$(date +%U)" DEPLOY_PATH="${TAG_NAME}/week_$(date +%U)"
TAG_SHA=$(cat commit_sha.txt)
if [ -n "$CUSTOM" ]; then if [ -n "$CUSTOM" ]; then
AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PRIVATE_SAS_TOKEN}" AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PRIVATE_SAS_TOKEN}"
AZURE_CONTAINER_NAME="${AZURE_PRIVATE_CONTAINER_NAME}" AZURE_CONTAINER_NAME="${AZURE_PRIVATE_CONTAINER_NAME}"
fi fi
if [ -n "$CI_COMMIT_TAG" ]; then if [ -n "$CI_COMMIT_TAG" ]; then
TAG_NAME=${CI_COMMIT_TAG} TAG_NAME=${CI_COMMIT_TAG}
TAG_SHA=${TAG_NAME}
DEPLOY_PATH=${TAG_NAME} DEPLOY_PATH=${TAG_NAME}
if [ ! -n "$CUSTOM" ]; then if [ ! -n "$CUSTOM" ]; then
AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}" AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
...@@ -185,7 +191,7 @@ workflow: ...@@ -185,7 +191,7 @@ workflow:
- | - |
echo "Deploying software artifacts to Azure.." echo "Deploying software artifacts to Azure.."
KERNEL=$(cat kernel.txt) 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 - sh .gitlab-ci/scripts/generate_report.sh $DEPLOY_PATH $AZURE_STORAGE_SAS_TOKEN $AZURE_CONTAINER_NAME $AZURE_PATH
allow_failure: true allow_failure: true
......
...@@ -12,14 +12,14 @@ else ...@@ -12,14 +12,14 @@ else
fi fi
export uboot_filename="seco_"$PROCESSOR""$board_suffix"_uboot-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.gz" 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="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="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="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="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="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" export bundle_filename_latest="seco_"$PROCESSOR""$board_suffix"_edgehog-bundle_"$KERNEL"_latest.raucb"
\ No newline at end of file \ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment