From f05bee12b27031819f0fbae6af4818e9d268e0b2 Mon Sep 17 00:00:00 2001
From: Lorenzo Pagliai <lorenzo.pagliai@seco.com>
Date: Mon, 20 Feb 2023 13:59:28 +0100
Subject: [PATCH] [FIX] Fix on filesystem artifact name
* The filesystem artifact name now match the image name
* Fix on artifacts name from build and deploy stage
---
manifest-pipeline-yocto.yml | 31 +++++++++++++++++--------------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index 35f38a8..d64720c 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -216,16 +216,16 @@ retrigger:
after_script:
- |
- 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
+ echo -e "### **"$BOARD"_"$RECIPE_NAME"**" >> Job_build_message_"$BOARD"_"$RECIPE_NAME".txt
+ echo "##################################################################" >> Job_build_report_"$BOARD"_"$RECIPE_NAME".txt
+ echo ""$BOARD"_"$RECIPE_NAME" JOB STATUS" >> Job_build_report_"$BOARD"_"$RECIPE_NAME".txt
+ echo "##################################################################" >> Job_build_report_"$BOARD"_"$RECIPE_NAME".txt
if [ $CI_JOB_STATUS == "failed" ]; then
- 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
+ echo -e "$CI_JOB_NAME: \t\t FAILED" >> Job_build_message_"$BOARD"_"$RECIPE_NAME".txt
+ echo -e "$CI_JOB_NAME: \t \t FAILED" >> Job_build_report_"$BOARD"_"$RECIPE_NAME".txt
else
- 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
+ echo -e "$CI_JOB_NAME: \t\t $CI_JOB_STATUS" >> Job_build_message_"$BOARD"_"$RECIPE_NAME".txt
+ echo -e "$CI_JOB_NAME \t \t $CI_JOB_STATUS" >> Job_build_report_"$BOARD"_"$RECIPE_NAME".txt
fi
artifacts:
@@ -233,8 +233,8 @@ retrigger:
paths:
- $BUILD_DIRECTORY/$IMAGES_PATH/$MACHINE/
- pathname.txt
- - Job_report_${BOARD}_${RECIPE_NAME}.txt
- - Job_message_${BOARD}_${RECIPE_NAME}.txt
+ - Job_build_report_${BOARD}_${RECIPE_NAME}.txt
+ - Job_build_message_${BOARD}_${RECIPE_NAME}.txt
allow_failure: true
#############################
@@ -275,8 +275,8 @@ retrigger:
uboot_filename_latest="seco_"$PROCESSOR"_"$BOARD"_uboot_"$KERNEL"_"$TAG_NAME"_latest.tar.gz"
kernel_filename="seco_"$PROCESSOR"_"$BOARD"_kernel_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.gz"
kernel_filename_latest="seco_"$PROCESSOR"_"$BOARD"_kernel_"$KERNEL"_"$TAG_NAME"_latest.tar.gz"
- filesystem_name="seco_"$PROCESSOR"_"$BOARD"_filesystem_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.bz2"
- filesystem_name_latest="seco_"$PROCESSOR"_"$BOARD"_filesystem_"$KERNEL"_"$TAG_NAME"_latest.tar.bz2"
+ filesystem_name="seco_"$PROCESSOR"_"$BOARD"_filesystem-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.bz2"
+ filesystem_name_latest="seco_"$PROCESSOR"_"$BOARD"_filesystem-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest.tar.bz2"
image_name="seco_"$PROCESSOR"_"$BOARD"_"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE"."$IMAGE_EXTENSION""
image_name_latest="seco_"$PROCESSOR"_"$BOARD"_"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest."$IMAGE_EXTENSION""
bmap_name="seco_"$PROCESSOR"_"$BOARD"_bmapfile-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".rootfs.wic.bmap"
@@ -460,6 +460,9 @@ retrigger:
after_script:
- |
+ mv Job_build_message_"$BOARD"_"$RECIPE_NAME".txt Job_message_"$BOARD"_"$RECIPE_NAME".txt
+ mv Job_build_report_"$BOARD"_"$RECIPE_NAME".txt Job_report_"$BOARD"_"$RECIPE_NAME".txt
+
if [ $CI_JOB_STATUS == "failed" ]; then
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
@@ -484,8 +487,8 @@ retrigger:
uboot_filename_latest="seco_"$PROCESSOR"_"$BOARD"_uboot_"$KERNEL"_"$TAG_NAME"_latest.tar.gz"
kernel_filename="seco_"$PROCESSOR"_"$BOARD"_kernel_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.gz"
kernel_filename_latest="seco_"$PROCESSOR"_"$BOARD"_kernel_"$KERNEL"_"$TAG_NAME"_latest.tar.gz"
- filesystem_name="seco_"$PROCESSOR"_"$BOARD"_filesystem_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.bz2"
- filesystem_name_latest="seco_"$PROCESSOR"_"$BOARD"_filesystem_"$KERNEL"_"$TAG_NAME"_latest.tar.bz2"
+ filesystem_name="seco_"$PROCESSOR"_"$BOARD"_filesystem-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".tar.bz2"
+ filesystem_name_latest="seco_"$PROCESSOR"_"$BOARD"_filesystem-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest.tar.bz2"
image_name="seco_"$PROCESSOR"_"$BOARD"_"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE"."$IMAGE_EXTENSION""
image_name_latest="seco_"$PROCESSOR"_"$BOARD"_"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest."$IMAGE_EXTENSION""
bmap_name="seco_"$PROCESSOR"_"$BOARD"_bmapfile-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".rootfs.wic.bmap"
--
GitLab