From 8bd8fc31519ac85a147b884f4d8506542b1877bf Mon Sep 17 00:00:00 2001
From: Lorenzo Pagliai <lorenzo.pagliai@seco.com>
Date: Fri, 17 Feb 2023 13:44:08 +0100
Subject: [PATCH] [REPORT NAME] Fix on name of the job/link REPORT
* The fix introduce the RECIPE_NAME variable in the job/link log name,
necessary when compiling also embedded distro
---
manifest-pipeline-yocto.yml | 66 ++++++++++++++++++-------------------
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index 62e7ad1..483be9b 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -214,16 +214,16 @@ retrigger:
after_script:
- |
- echo -e "### **$BOARD**" >> Job_message_$BOARD.txt
- echo "##################################################################" >> Job_report_$BOARD.txt
- echo "$BOARD JOB STATUS" >> Job_report_$BOARD.txt
- echo "##################################################################" >> Job_report_$BOARD.txt
+ echo -e "### **"$BOARD"_"$RECIPE_NAME"**" >> Job_message_"$BOARD"_"$RECIPE_NAME".txt
+ echo "##################################################################" >> Job_report_"$BOARD"_"$RECIPE_NAME".txt
+ echo ""$BOARD"_"$RECIPE_NAME" JOB STATUS" >> Job_report_"$BOARD"_"$RECIPE_NAME".txt
+ echo "##################################################################" >> Job_report_"$BOARD"_"$RECIPE_NAME".txt
if [ $CI_JOB_STATUS == "failed" ]; then
- echo -e "$CI_JOB_NAME: \t\t FAILED" >> Job_message_$BOARD.txt
- echo -e "$CI_JOB_NAME: \t \t FAILED" >> Job_report_$BOARD.txt
+ echo -e "$CI_JOB_NAME: \t\t FAILED" >> Job_message_"$BOARD"_"$RECIPE_NAME".txt
+ echo -e "$CI_JOB_NAME: \t \t FAILED" >> Job_report_"$BOARD"_"$RECIPE_NAME".txt
else
- echo -e "$CI_JOB_NAME: \t\t $CI_JOB_STATUS" >> Job_message_$BOARD.txt
- echo -e "$CI_JOB_NAME \t \t $CI_JOB_STATUS" >> Job_report_$BOARD.txt
+ echo -e "$CI_JOB_NAME: \t\t $CI_JOB_STATUS" >> Job_message_"$BOARD"_"$RECIPE_NAME".txt
+ echo -e "$CI_JOB_NAME \t \t $CI_JOB_STATUS" >> Job_report_"$BOARD"_"$RECIPE_NAME".txt
fi
artifacts:
@@ -231,8 +231,8 @@ retrigger:
paths:
- $BUILD_DIRECTORY/$IMAGES_PATH/$MACHINE/
- pathname.txt
- - Job_report_$BOARD.txt
- - Job_message_$BOARD.txt
+ - Job_report_"$BOARD"_"$RECIPE_NAME".txt
+ - Job_message_"$BOARD"_"$RECIPE_NAME".txt
allow_failure: true
#############################
@@ -457,11 +457,11 @@ retrigger:
after_script:
- |
if [ $CI_JOB_STATUS == "failed" ]; then
- echo -e "$CI_JOB_NAME: \t\t FAILED" >> Job_message_$BOARD.txt
- echo -e "$CI_JOB_NAME: \t \t FAILED" >> Job_report_$BOARD.txt
+ echo -e "$CI_JOB_NAME: \t\t FAILED" >> Job_message_"$BOARD"_"$RECIPE_NAME".txt
+ echo -e "$CI_JOB_NAME: \t \t FAILED" >> Job_report_"$BOARD"_"$RECIPE_NAME".txt
else
- echo -e "$CI_JOB_NAME: \t\t $CI_JOB_STATUS" >> Job_message_$BOARD.txt
- echo -e "$CI_JOB_NAME \t $CI_JOB_STATUS" >> Job_report_$BOARD.txt
+ echo -e "$CI_JOB_NAME: \t\t $CI_JOB_STATUS" >> Job_message_"$BOARD"_"$RECIPE_NAME".txt
+ echo -e "$CI_JOB_NAME \t $CI_JOB_STATUS" >> Job_report_"$BOARD"_"$RECIPE_NAME".txt
fi
if [ -n "$CI_COMMIT_TAG" ]; then
@@ -471,9 +471,9 @@ retrigger:
AZURE_PATH="${AZURE_PATH}/edgehog"
fi
- echo "##################################################################" >> Link_report_$BOARD.txt
- echo "$BOARD URLs" >> Link_report_$BOARD.txt
- echo "##################################################################" >> Link_report_$BOARD.txt
+ echo "##################################################################" >> Link_report_"$BOARD"_"$RECIPE_NAME".txt
+ echo ""$BOARD"_"$RECIPE_NAME" URLs" >> Link_report_"$BOARD"_"$RECIPE_NAME".txt
+ echo "##################################################################" >> Link_report_"$BOARD"_"$RECIPE_NAME".txt
DEPLOY_DATE=$(date +%Y%m%d)
uboot_filename="seco_"$PROCESSOR"_"$BOARD"_uboot_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.gz"
@@ -491,33 +491,33 @@ retrigger:
if [ "$CI_JOB_STATUS" == "success" ]; then
if [[ "${CI_JOB_NAME}" != *"embedded"* ]]; then
- echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$uboot_filename) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
- echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$kernel_filename) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
- echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$bundle_filename) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
+ echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$uboot_filename) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$RECIPE_NAME".txt
+ echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$kernel_filename) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$RECIPE_NAME".txt
+ echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$bundle_filename) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$RECIPE_NAME".txt
fi
- echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$filesystem_name) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
- echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$image_name) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
- echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$bmap_name) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
+ echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$filesystem_name) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$RECIPE_NAME".txt
+ echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$image_name) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$RECIPE_NAME".txt
+ echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$bmap_name) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$RECIPE_NAME".txt
if [ ! -n "$CI_COMMIT_TAG" ]; then
if [[ "${CI_JOB_NAME}" != *"embedded"* ]]; then
- echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$uboot_filename_latest) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
- echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$kernel_filename_latest) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
- echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$bundle_filename_latest) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
+ echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$uboot_filename_latest) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$RECIPE_NAME".txt
+ echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$kernel_filename_latest) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$RECIPE_NAME".txt
+ echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$bundle_filename_latest) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$RECIPE_NAME".txt
fi
- echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$filesystem_name_latest) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
- echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$image_name_latest) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
- echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$bmap_name_latest) | sed -E 's/\?s.*//' >> Link_report_$BOARD.txt
+ echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$filesystem_name_latest) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$RECIPE_NAME".txt
+ echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$image_name_latest) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$RECIPE_NAME".txt
+ echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$TAG_NAME/$bmap_name_latest) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$RECIPE_NAME".txt
fi
else
- echo -e "JOBS FAILED" >> Link_report_$BOARD.txt
+ echo -e "JOBS FAILED" >> Link_report_"$BOARD"_"$RECIPE_NAME".txt
fi
allow_failure: true
artifacts:
paths:
- - Job_report_$BOARD.txt
- - Job_message_$BOARD.txt
- - Link_report_$BOARD.txt
+ - Job_report_"$BOARD"_"$RECIPE_NAME".txt
+ - Job_message_"$BOARD"_"$RECIPE_NAME".txt
+ - Link_report_"$BOARD"_"$RECIPE_NAME".txt
#############################
####### CHANGE LOG ##########
--
GitLab