Refactoring: remove RELEASE_NAME from deploy targets

Append it to the configured target at the deploy class level instead.
This removes the need for eval'ing the variables before usage.
RELEASE_NAME can be used directly at the class level because it is known
from build-version.env.

This makes the deploy behavior identical to the Azure stage.

build-pipeline-yocto.yml.jinja2

@@ -153,16 +153,16 @@ deploy-{{ machine }}:
   stage: Deploy SoftwareStore
   variables:
     MACHINE: {{ machine }}
-    DEPLOY_SOURCE: $${RELEASE_NAME}
-    DEPLOY_TARGET: ${DEPLOY_RELEASE_TARGET}
-    DEPLOY_TARGET_LINK: ${DEPLOY_RELEASE_TARGET_LINK}
+    DEPLOY_SOURCE: ${RELEASE_NAME}
+    DEPLOY_TARGET: ${DEPLOY_RELEASE_TARGET}/${RELEASE_NAME}
+    DEPLOY_TARGET_LINK: ${DEPLOY_RELEASE_TARGET_LINK}/${RELEASE_NAME}
 {% else %}
   stage: Deploy SoftwareStore Internal
   variables:
     MACHINE: {{ machine }}
-    DEPLOY_SOURCE: $${RELEASE_NAME}
-    DEPLOY_TARGET: ${DEPLOY_INTERNAL_RELEASE_TARGET}
-    DEPLOY_TARGET_LINK: ${DEPLOY_INTERNAL_RELEASE_TARGET_LINK}
+    DEPLOY_SOURCE: ${RELEASE_NAME}
+    DEPLOY_TARGET: ${DEPLOY_INTERNAL_RELEASE_TARGET}/${RELEASE_NAME}
+    DEPLOY_TARGET_LINK: ${DEPLOY_INTERNAL_RELEASE_TARGET_LINK}/${RELEASE_NAME}
 {% endif %}
     ASSOCIATED_PACKAGE_JOB: package-{{ machine }}
   needs:
@@ -206,9 +206,9 @@ ftp-{{ machine }}:
     - ftp
   variables:
     MACHINE: {{ machine }}
-    DEPLOY_SOURCE: $${RELEASE_NAME}
-    DEPLOY_TARGET: ${DEPLOY_FTP_TARGET}
-    DEPLOY_TARGET_LINK: ${DEPLOY_FTP_TARGET_LINK}
+    DEPLOY_SOURCE: ${RELEASE_NAME}
+    DEPLOY_TARGET: ${DEPLOY_FTP_TARGET}/${RELEASE_NAME}
+    DEPLOY_TARGET_LINK: ${DEPLOY_FTP_TARGET_LINK}/${RELEASE_NAME}
     ASSOCIATED_PACKAGE_JOB: package-{{ machine }}
   needs:
     - job: package-{{ machine }}
@@ -235,8 +235,8 @@ azure-{{ machine }}:
       allow_failure: true
   variables:
     MACHINE: {{ machine }}
-    DEPLOY_SOURCE: $${RELEASE_NAME}
-    DEPLOY_TARGET: ${AZURE_TARGET_FOLDER}/$${RELEASE_NAME}
+    DEPLOY_SOURCE: ${RELEASE_NAME}
+    DEPLOY_TARGET: ${AZURE_TARGET_FOLDER}/${RELEASE_NAME}
     CONTAINER_NAME: ${AZURE_CONTAINER_NAME}
     ASSOCIATED_PACKAGE_JOB: package-{{ machine }}
   needs:

build-pipeline.yml

@@ -373,15 +373,6 @@ workflow:
     # Save MACHINE for confluence stage. This variable cannot be passed directly on the
     # job definition level because the confluence stage is machine-independent.
     - echo "MACHINE=${MACHINE}" > deploy.env
-    # Expand eventual nested variables contained within the DEPLOY_* variables
-    # FIXME: For now we need a double 'eval' here due to a GitLab bug:
-    # https://gitlab.com/gitlab-org/gitlab/-/issues/273409
-    # Escaped variables are not correctly passed to child pipelines. Proposed workaround
-    # is to use raw variables, but we need at least GitLab 15.6 for that. As soon as we
-    # update our GitLab, we can use the former mechanism using a single 'eval'.
-    - DEPLOY_SOURCE=$(eval eval echo "${DEPLOY_SOURCE}")
-    - DEPLOY_TARGET=$(eval eval echo "${DEPLOY_TARGET}")
-    - DEPLOY_TARGET_LINK=$(eval eval echo "${DEPLOY_TARGET_LINK}")
   timeout: 60m
   cache:
     # Get the packaged artifacts from the cache

manifest-pipeline-ci-test.yml

@@ -32,20 +32,12 @@ variables:
 
 .yocto-deploy:
   variables:
-    # FIXME: For now we need a quoted dollar sign here due to a GitLab bug:
-    # https://gitlab.com/gitlab-org/gitlab/-/issues/273409
-    # Escaped variables are not correctly passed to child pipelines. Proposed workaround
-    # is to use raw variables, but we need at least GitLab 15.6 for that. As soon as we
-    # update our GitLab, we can use the former mechanism using '$$RELEASE_NAME'.
-    DEPLOY_RELEASE_TARGET: /artifacts-yocto/Test/"$"{RELEASE_NAME}
-    DEPLOY_RELEASE_TARGET_LINK: >-
-      Z:/Development/SoftwareStore/Linux-Yocto/Test/"$"{RELEASE_NAME}
-    DEPLOY_INTERNAL_RELEASE_TARGET: /artifacts-yocto/Test/"$"{RELEASE_NAME}
-    DEPLOY_INTERNAL_RELEASE_TARGET_LINK: >-
-      Z:/Development/SoftwareStore/Linux-Yocto/Test/"$"{RELEASE_NAME}
-    DEPLOY_FTP_TARGET: /artifacts-ftp-yocto/Test/"$"{RELEASE_NAME}
-    DEPLOY_FTP_TARGET_LINK: >-
-      http://support.garz-fricke.com/projects/Linux-Yocto/Test/"$"{RELEASE_NAME}
+    DEPLOY_RELEASE_TARGET: /artifacts-yocto/Test
+    DEPLOY_RELEASE_TARGET_LINK: Z:/Development/SoftwareStore/Linux-Yocto/Test
+    DEPLOY_INTERNAL_RELEASE_TARGET: /artifacts-yocto/Test
+    DEPLOY_INTERNAL_RELEASE_TARGET_LINK: Z:/Development/SoftwareStore/Linux-Yocto/Test
+    DEPLOY_FTP_TARGET: /artifacts-ftp-yocto/Test
+    DEPLOY_FTP_TARGET_LINK: http://support.garz-fricke.com/projects/Linux-Yocto/Test
     AZURE_TARGET_FOLDER: HMI/Linux-Yocto/Test
     AZURE_CONTAINER_NAME: seco-ne-public
 

manifest-pipeline-yocto.yml

@@ -28,34 +28,26 @@ variables:
 
 .yocto-deploy:
   variables:
-    # FIXME: For now we need a quoted dollar sign here due to a GitLab bug:
-    # https://gitlab.com/gitlab-org/gitlab/-/issues/273409
-    # Escaped variables are not correctly passed to child pipelines. Proposed workaround
-    # is to use raw variables, but we need at least GitLab 15.6 for that. As soon as we
-    # update our GitLab, we can use the former mechanism using '$$RELEASE_NAME'.
-    DEPLOY_RELEASE_TARGET: /artifacts-yocto/Releases/"$"{RELEASE_NAME}
-    DEPLOY_RELEASE_TARGET_LINK: >-
-      Z:/Development/SoftwareStore/Linux-Yocto/Releases/"$"{RELEASE_NAME}
-    DEPLOY_INTERNAL_RELEASE_TARGET: /artifacts-yocto/Interne_Releases/"$"{RELEASE_NAME}
+    DEPLOY_RELEASE_TARGET: /artifacts-yocto/Releases
+    DEPLOY_RELEASE_TARGET_LINK: Z:/Development/SoftwareStore/Linux-Yocto/Releases
+    DEPLOY_INTERNAL_RELEASE_TARGET: /artifacts-yocto/Interne_Releases
     DEPLOY_INTERNAL_RELEASE_TARGET_LINK: >-
-      Z:/Development/SoftwareStore/Linux-Yocto/Interne_Releases/"$"{RELEASE_NAME}
-    DEPLOY_FTP_TARGET: /artifacts-ftp-yocto/Releases/"$"{RELEASE_NAME}
+      Z:/Development/SoftwareStore/Linux-Yocto/Interne_Releases
+    DEPLOY_FTP_TARGET: /artifacts-ftp-yocto/Releases/
     DEPLOY_FTP_TARGET_LINK: >-
-      http://support.garz-fricke.com/projects/Linux-Yocto/Releases/"$"{RELEASE_NAME}
+      http://support.garz-fricke.com/projects/Linux-Yocto/Releases/
     AZURE_TARGET_FOLDER: HMI/Linux-Yocto/Releases
     AZURE_CONTAINER_NAME: seco-ne-public
 
 .fngsystem-deploy:
   variables:
-    DEPLOY_RELEASE_TARGET: /artifacts-fngsystem/"$"{RELEASE_NAME}
-    DEPLOY_RELEASE_TARGET_LINK: >-
-      Z:/Development/SoftwareStore/Flash-N-Go/FNGSystem/"$"{RELEASE_NAME}
-    DEPLOY_INTERNAL_RELEASE_TARGET: /artifacts-fngsystem/CI_Builds/"$"{RELEASE_NAME}
+    DEPLOY_RELEASE_TARGET: /artifacts-fngsystem
+    DEPLOY_RELEASE_TARGET_LINK: Z:/Development/SoftwareStore/Flash-N-Go/FNGSystem
+    DEPLOY_INTERNAL_RELEASE_TARGET: /artifacts-fngsystem/CI_Builds
     DEPLOY_INTERNAL_RELEASE_TARGET_LINK: >-
-      Z:/Development/SoftwareStore/Flash-N-Go/FNGSystem/CI_Builds/"$"{RELEASE_NAME}
-    DEPLOY_FTP_TARGET: /artifacts-ftp-fngsystem/"$"{RELEASE_NAME}
-    DEPLOY_FTP_TARGET_LINK: >-
-      http://support.garz-fricke.com/projects/Flash-N-Go/FNGSystem/"$"{RELEASE_NAME}
+      Z:/Development/SoftwareStore/Flash-N-Go/FNGSystem/CI_Builds
+    DEPLOY_FTP_TARGET: /artifacts-ftp-fngsystem
+    DEPLOY_FTP_TARGET_LINK: http://support.garz-fricke.com/projects/Flash-N-Go/FNGSystem
     AZURE_TARGET_FOLDER: HMI/Flash-N-Go/FNGSystem
     AZURE_CONTAINER_NAME: seco-ne-public