diff --git a/manifest-integration-pipelines.yml.jinja2 b/manifest-integration-pipelines.yml.jinja2 index 337747f88991f43a5515e9513ad4024d18a7b6f2..419083abf423b3284a3132e70d1898bc28f97f78 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