From eb3ddd0e24234b42d3fd0808ec2c61cf5c566bf4 Mon Sep 17 00:00:00 2001
From: Lorenzo Pagliai <lorenzo.pagliai@seco.com>
Date: Tue, 18 Apr 2023 09:49:10 +0200
Subject: [PATCH] [CUSTOM] Custom projects deploy to the same container
* Instead of using two containers all custom projects are deployed to
the same container
---
manifest-pipeline-yocto.yml | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index 9f348ea..f31ff80 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -270,18 +270,18 @@ retrigger:
- DEPLOY_DATE=$(date +%Y%m%d)
- DEPLOY_PATH="${TAG_NAME}/week_$(date +%U)"
- |
- if [ -n "$CI_COMMIT_TAG" ]; then
- TAG_NAME=${CI_COMMIT_TAG}
- DEPLOY_PATH=${TAG_NAME}
- AZURE_PATH="${AZURE_PATH}/edgehog"
- if [ ! -n "$CUSTOM" ]; then
- AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
- AZURE_CONTAINER_NAME="${AZURE_PUBLIC_CONTAINER_NAME}"
- else
+ if [ -n "$CUSTOM" ]; then
AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PRIVATE_SAS_TOKEN}"
AZURE_CONTAINER_NAME="${AZURE_PRIVATE_CONTAINER_NAME}"
- fi
- fi
+ fi
+ if [ -n "$CI_COMMIT_TAG" ]; then
+ TAG_NAME=${CI_COMMIT_TAG}
+ DEPLOY_PATH=${TAG_NAME}
+ if [ ! -n "$CUSTOM" ]; then
+ AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
+ AZURE_CONTAINER_NAME="${AZURE_PUBLIC_CONTAINER_NAME}"
+ fi
+ fi
- |
echo "Starting the deploy of software artifacts"
- |
@@ -311,6 +311,10 @@ retrigger:
DEPLOY_PATH="${TAG_NAME}/week_$(date +%U)"
DEPLOY_DATE=$(date +%Y%m%d)
+ if [ -n "$CUSTOM" ]; then
+ AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PRIVATE_SAS_TOKEN}"
+ AZURE_CONTAINER_NAME="${AZURE_PRIVATE_CONTAINER_NAME}"
+ fi
if [ -n "$CI_COMMIT_TAG" ]; then
TAG_NAME=${CI_COMMIT_TAG}
DEPLOY_PATH=${TAG_NAME}
@@ -318,10 +322,6 @@ retrigger:
if [ ! -n "$CUSTOM" ]; then
AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
AZURE_CONTAINER_NAME="${AZURE_PUBLIC_CONTAINER_NAME}"
- else
- AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PRIVATE_SAS_TOKEN}"
- AZURE_CONTAINER_NAME="${AZURE_PRIVATE_CONTAINER_NAME}"
- fi
fi
echo "##################################################################" >> Link_report_"$BOARD"_"$IMAGE_NAME".txt
@@ -392,15 +392,15 @@ notify:
AZURE_PATH="edgehog/reports"
+ if [ -n "$CUSTOM" ]; then
+ AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PRIVATE_SAS_TOKEN}"
+ AZURE_CONTAINER_NAME="${AZURE_PRIVATE_CONTAINER_NAME}"
+ fi
if [ -n "$CI_COMMIT_TAG" ]; then
TAG_NAME=${CI_COMMIT_TAG}
if [ ! -n "$CUSTOM" ]; then
AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PUBLIC_SAS_TOKEN}"
AZURE_CONTAINER_NAME="${AZURE_PUBLIC_CONTAINER_NAME}"
- else
- AZURE_STORAGE_SAS_TOKEN="${AZURE_STORAGE_PRIVATE_SAS_TOKEN}"
- AZURE_CONTAINER_NAME="${AZURE_PRIVATE_CONTAINER_NAME}"
- fi
else
TAG_NAME=$(date +%Y%m%d)
fi
--
GitLab