From c3fd0ecc141c9247cdefcc197b731333c1f14da0 Mon Sep 17 00:00:00 2001
From: Tim Jaacks <tim.jaacks@garz-fricke.com>
Date: Wed, 31 Aug 2022 07:23:29 +0200
Subject: [PATCH] Check if variable is defined before checking it value
---
manifest-integration-pipelines.yml.jinja2 | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/manifest-integration-pipelines.yml.jinja2 b/manifest-integration-pipelines.yml.jinja2
index 337747f8..419083ab 100644
--- a/manifest-integration-pipelines.yml.jinja2
+++ b/manifest-integration-pipelines.yml.jinja2
@@ -35,8 +35,9 @@ generate:
# to explicitly pass any of them as command line arguments.
{% for integration in INTEGRATION.split('\n') %}
{% set SOURCE_BRANCH, TARGET_PROJECT, TARGET_BRANCH = integration.split(':') %}
-{% if SOURCE_BRANCH == CI_MERGE_REQUEST_TARGET_BRANCH_NAME or
- SOURCE_BRANCH == CI_COMMIT_REF_NAME %}
+{% if (CI_MERGE_REQUEST_TARGET_BRANCH_NAME is defined
+ and SOURCE_BRANCH == CI_MERGE_REQUEST_TARGET_BRANCH_NAME)
+ or SOURCE_BRANCH == CI_COMMIT_REF_NAME %}
- TARGET_PROJECT={{ TARGET_PROJECT }}
.gitlab-ci/scripts/generate_job_from_template.py
--template=.gitlab-ci/manifest-integration-jobs.yml.jinja2
@@ -53,8 +54,9 @@ generate:
# --------------------------------------------------------------------------------------
{% for integration in INTEGRATION.split('\n') %}
{% set SOURCE_BRANCH, TARGET_PROJECT, TARGET_BRANCH = integration.split(':') %}
-{% if SOURCE_BRANCH == CI_MERGE_REQUEST_TARGET_BRANCH_NAME or
- SOURCE_BRANCH == CI_COMMIT_REF_NAME %}
+{% if (CI_MERGE_REQUEST_TARGET_BRANCH_NAME is defined
+ and SOURCE_BRANCH == CI_MERGE_REQUEST_TARGET_BRANCH_NAME)
+ or SOURCE_BRANCH == CI_COMMIT_REF_NAME %}
{{ TARGET_PROJECT }}:{{ TARGET_BRANCH }}:
stage: infrastructure
--
GitLab