From 1d3edf2f8000b52c8a286b3f9c08f7adc70ed39d Mon Sep 17 00:00:00 2001
From: Lorenzo Pagliai <lorenzo.pagliai@seco.com>
Date: Fri, 17 Feb 2023 09:00:52 +0100
Subject: [PATCH] [FIX] Bug fix in deploy stage

---
 manifest-pipeline-yocto.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index c0c844c..0cfb4b7 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -275,11 +275,11 @@ retrigger:
          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"
-         bmap_name_latest="seco_"$PROCESSOR"_"$BOARD"_bmapfile-"${IMAGE_NAME}"_"$KERNEL"_"$TAG_NAME"_latest.rootfs.wic.bmap"
+         bmap_name_latest="seco_"$PROCESSOR"_"$BOARD"_bmapfile-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest.rootfs.wic.bmap"
          bundle_filename="seco_"$PROCESSOR"_"$BOARD"_edgehog-bundle_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".raucb"
          bundle_filename_latest="seco_"$PROCESSOR"_"$BOARD"_edgehog-bundle_"$KERNEL"_"$TAG_NAME"_latest.raucb"
         
-         if [[ "${$CI_JOB_NAME}" != *"embedded"* ]]; then
+         if [[ "${CI_JOB_NAME}" != *"embedded"* ]]; then
             case none in 
             *${UBOOT_FILE}*) echo "Not deploying U-Boot for this board since not present";;
             *              )
@@ -483,7 +483,7 @@ retrigger:
         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"
-        bmap_name_latest="seco_"$PROCESSOR"_"$BOARD"_bmapfile-"${IMAGE_NAME}"_"$KERNEL"_"$TAG_NAME"_latest.rootfs.wic.bmap"
+        bmap_name_latest="seco_"$PROCESSOR"_"$BOARD"_bmapfile-"$IMAGE_NAME"_"$KERNEL"_"$TAG_NAME"_latest.rootfs.wic.bmap"
         bundle_filename="seco_"$PROCESSOR"_"$BOARD"_edgehog-bundle_"$KERNEL"_"$TAG_NAME"_"$DEPLOY_DATE".raucb"
         bundle_filename_latest="seco_"$PROCESSOR"_"$BOARD"_edgehog-bundle_"$KERNEL"_"$TAG_NAME"_latest.raucb"
 
-- 
GitLab