From 5779bbf5a859e0111a5f2ef805eec5b62f6cb7eb Mon Sep 17 00:00:00 2001
From: Lorenzo Pagliai <lorenzo.pagliai@seco.com>
Date: Fri, 14 Apr 2023 12:23:44 +0200
Subject: [PATCH] [DEPLOY] Fix on artifacts name assignment script
---
manifest-pipeline-yocto.yml | 10 +++++-----
scripts/deploy_artifacts.sh | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index 27492f8..d23767b 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -279,8 +279,8 @@ retrigger:
AZURE_CONTAINER_NAME="${AZURE_PUBLIC_CONTAINER_NAME}"
fi
fi
- - . .gitlab-ci/scripts/artifacts_name.sh $TAG_NAME \
- $DEPLOY_DATE
+ - |
+ . .gitlab-ci/scripts/artifacts_name.sh $TAG_NAME $DEPLOY_DATE
- sh .gitlab-ci/scripts/deploy_artifacts.sh $BASE_DIRECTORY \
$ART_PATH \
$DEPLOY_PATH \
@@ -318,8 +318,8 @@ retrigger:
echo ""$BOARD"_"$IMAGE_NAME" URLs" >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
echo "##################################################################" >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
- - . .gitlab-ci/scripts/artifacts_name.sh $TAG_NAME \
- $DEPLOY_DATE
+ - |
+ . .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 \
@@ -438,4 +438,4 @@ release:
echo $command >> release.sh
cat release.sh
chmod +x release.sh
- sh release.sh
+ sh release.sh
\ No newline at end of file
diff --git a/scripts/deploy_artifacts.sh b/scripts/deploy_artifacts.sh
index fc03aef..0e13e07 100644
--- a/scripts/deploy_artifacts.sh
+++ b/scripts/deploy_artifacts.sh
@@ -7,7 +7,7 @@ AZURE_STORAGE_SAS_TOKEN=$4
AZURE_CONTAINER_NAME=$5
AZURE_PATH=$6
-if [[ "${CI_JOB_NAME}" != *"embedded"* ]]; then
+if [[ ! "${CI_JOB_NAME}" =~ "embedded" ]]; then
echo "##################################################################"
echo "####################### BUNDLE FILE ############################"
--
GitLab