Fix issue with no publish env causing ssh_credential_id to not be added

inviqa · Mar 14, 2023 · d394c86 · d394c86
1 parent 97f3bfa
commit d394c86
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/_base/application/overlay/Jenkinsfile.twig b/src/_base/application/overlay/Jenkinsfile.twig
@@ -67,13 +67,15 @@ pipeline {
 {% endif %}
 {% if bool(@('pipeline.publish.enabled')) %}
         stage('Publish') {
-{% if @('pipeline.publish.environment') %}
+{% set env = @('pipeline.publish.environment') %}
+{% set ssh_credential_id = @('pipeline.publish.chart.git.ssh_credential_id') %}
+{% if env or ssh_credential_id %}
             environment {
-{% for key, value in @('pipeline.publish.environment') %}
+{% for key, value in env %}
                 {{ key }} = {{ value }}
 {% endfor %}
-{% if @('pipeline.publish.chart.git.ssh_credential_id') %}
-                WS_APP_PUBLISH_CHART_SSH_PRIVATE_KEY = credentials('{{ @('pipeline.publish.chart.git.ssh_credential_id') }}')
+{% if ssh_credential_id %}
+                WS_APP_PUBLISH_CHART_SSH_PRIVATE_KEY = credentials('{{ ssh_credential_id }}')
 {% endif %}
             }
 {% endif %}