From 650b961de1b4d673f9ec8c18c0767e843cedce9b Mon Sep 17 00:00:00 2001
From: Lorenzo Pagliai <lorenzo.pagliai@seco.com>
Date: Mon, 3 Apr 2023 14:21:20 +0200
Subject: [PATCH] [PATH] Fix the path of automation scripts
---
manifest-pipeline-yocto.yml | 39 +++++++++++++++++++------------------
scripts/notify_message.sh | 8 ++++----
2 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index 41200ab..0b8c72a 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -278,14 +278,14 @@ retrigger:
AZURE_CONTAINER_NAME="${AZURE_PUBLIC_CONTAINER_NAME}"
fi
fi
- - . scripts/artifacts_name.sh $TAG_NAME \
- $DEPLOY_DATE
- - sh scripts/deploy_artifacts.sh $BASE_DIRECTORY \
- $ART_PATH \
- $DEPLOY_PATH \
- $AZURE_STORAGE_SAS_TOKEN \
- $AZURE_CONTAINER_NAME \
- $AZURE_PATH
+ - . .gitlab-ci/scripts/artifacts_name.sh $TAG_NAME \
+ $DEPLOY_DATE
+ - sh .gitlab-ci/scripts/deploy_artifacts.sh $BASE_DIRECTORY \
+ $ART_PATH \
+ $DEPLOY_PATH \
+ $AZURE_STORAGE_SAS_TOKEN \
+ $AZURE_CONTAINER_NAME \
+ $AZURE_PATH
after_script:
- |
@@ -317,12 +317,12 @@ retrigger:
echo ""$BOARD"_"$IMAGE_NAME" URLs" >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
echo "##################################################################" >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
- - . scripts/artifacts_name.sh $TAG_NAME \
- $DEPLOY_DATE
- - sh scripts/generate_report.sh $DEPLOY_PATH \
- $AZURE_STORAGE_SAS_TOKEN \
- $AZURE_CONTAINER_NAME \
- $AZURE_PATH
+ - . .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
allow_failure: true
artifacts:
@@ -348,7 +348,8 @@ changelog:
- for project in ${CHANGELOG_PROJECTS}; do
PROJECT_ARGS="${PROJECT_ARGS} --project=$project";
done
- - .gitlab-ci./scripts/changelog_generator.py
+ - echo ${PROJECT_ARGS}
+ - .gitlab-ci/scripts/changelog_generator.py
--token=${GITBOT_TOKEN}
--branch=${MASTER_BRANCH}
--project=${CI_PROJECT_PATH}
@@ -391,10 +392,10 @@ notify:
else
TAG_NAME=$(date +%Y%m%d)
fi
- - sh scripts/notify_message.sh $AZURE_PATH \
- $TAG_NAME \
- $AZURE_STORAGE_SAS_TOKEN \
- $AZURE_CONTAINER_NAME
+ - sh .gitlab-ci/scripts/notify_message.sh $AZURE_PATH \
+ $TAG_NAME \
+ $AZURE_STORAGE_SAS_TOKEN \
+ $AZURE_CONTAINER_NAME
artifacts:
expire_in: 4 weeks
diff --git a/scripts/notify_message.sh b/scripts/notify_message.sh
index 3f4633b..cb0c995 100644
--- a/scripts/notify_message.sh
+++ b/scripts/notify_message.sh
@@ -5,11 +5,11 @@ TAG_NAME=$2
AZURE_STORAGE_SAS_TOKEN=$3
AZURE_CONTAINER_NAME=$4
-cat Job_message.txt Job_message_*.txt >Job_message_edgehog_${TAG_NAME}.txt
-cat Job_report_*.txt >Job_report_edgehog_${TAG_NAME}.txt
-cat Link_report_*.txt >Link_report_edgehog_${TAG_NAME}.txt
+cat Job_message.txt Job_message_*.txt > Job_message_edgehog_${TAG_NAME}.txt
+cat Job_report_*.txt > Job_report_edgehog_${TAG_NAME}.txt
+cat Link_report_*.txt > Link_report_edgehog_${TAG_NAME}.txt
-cat changelog.md >Changelog_edgehog_${TAG_NAME}.md
+cat changelog.md > Changelog_edgehog_${TAG_NAME}.md
sed -i -E 's/\"//g' Link_report_edgehog_${TAG_NAME}.txt
--
GitLab