[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

@@ -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