From 156d0a3efc9de9cfb2511b737bc922032598f069 Mon Sep 17 00:00:00 2001
From: Lorenzo Pagliai <lorenzo.pagliai@seco.com>
Date: Fri, 14 Apr 2023 16:21:13 +0200
Subject: [PATCH] [NOTIFY] Fix on script execution syntax
---
manifest-pipeline-yocto.yml | 5 +----
scripts/generate_report.sh | 4 ++--
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index f582cd9..78c8c24 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -325,10 +325,7 @@ retrigger:
- |
echo "Deploying software artifacts to Azure.."
. .gitlab-ci/scripts/artifacts_name.sh $TAG_NAME $DEPLOY_DATE
- - 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
artifacts:
diff --git a/scripts/generate_report.sh b/scripts/generate_report.sh
index cd3e82c..7a1bcda 100644
--- a/scripts/generate_report.sh
+++ b/scripts/generate_report.sh
@@ -6,7 +6,7 @@ AZURE_CONTAINER_NAME=$3
AZURE_PATH=$4
if [ "$CI_JOB_STATUS" == "success" ]; then
- if [[ "${CI_JOB_NAME}" != *"embedded"* ]]; then
+ if [[ ! "${CI_JOB_NAME}" =~ "embedded" ]]; then
echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$bundle_filename) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
fi
case none in
@@ -27,7 +27,7 @@ if [ "$CI_JOB_STATUS" == "success" ]; then
echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$bmap_name) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
if [ ! -n "$CI_COMMIT_TAG" ]; then
- if [[ "${CI_JOB_NAME}" != *"embedded"* ]]; then
+ if [[ ! "${CI_JOB_NAME}" =~ "embedded" ]]; then
echo -e $(az storage blob url --container-name $AZURE_CONTAINER_NAME --name $AZURE_PATH/$DEPLOY_PATH/$bundle_filename_latest) | sed -E 's/\?s.*//' >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
fi
--
GitLab