Skip to content
Snippets Groups Projects
Commit c1be0f4b authored by Tim Jaacks's avatar Tim Jaacks
Browse files

Fix jinja2 "or" operator

parent 8da534ec
No related branches found
No related tags found
1 merge request!198Fix jinja2 "or" operator
Pipeline #28664 waiting for manual action with stages
Stage:
    Stage:
      in 1 minute and 35 seconds
      Hide whitespace changes
      Inline Side-by-side
      manifest-integration-pipelines.yml.jinja2
      + 2
      − 2
      View file @ c1be0f4b
      ...@@ -35,7 +35,7 @@ generate: ...@@ -35,7 +35,7 @@ generate:
      # to explicitly pass any of them as command line arguments. # to explicitly pass any of them as command line arguments.
      {% for integration in INTEGRATION.split('\n') %} {% for integration in INTEGRATION.split('\n') %}
      {% set SOURCE_BRANCH, TARGET_PROJECT, TARGET_BRANCH = integration.split(':') %} {% set SOURCE_BRANCH, TARGET_PROJECT, TARGET_BRANCH = integration.split(':') %}
      {% if SOURCE_BRANCH == CI_MERGE_REQUEST_TARGET_BRANCH_NAME || {% if SOURCE_BRANCH == CI_MERGE_REQUEST_TARGET_BRANCH_NAME or
      SOURCE_BRANCH == CI_COMMIT_REF_NAME %} SOURCE_BRANCH == CI_COMMIT_REF_NAME %}
      - TARGET_PROJECT={{ TARGET_PROJECT }} - TARGET_PROJECT={{ TARGET_PROJECT }}
      .gitlab-ci/scripts/generate_job_from_template.py .gitlab-ci/scripts/generate_job_from_template.py
      ...@@ -53,7 +53,7 @@ generate: ...@@ -53,7 +53,7 @@ generate:
      # -------------------------------------------------------------------------------------- # --------------------------------------------------------------------------------------
      {% for integration in INTEGRATION.split('\n') %} {% for integration in INTEGRATION.split('\n') %}
      {% set SOURCE_BRANCH, TARGET_PROJECT, TARGET_BRANCH = integration.split(':') %} {% set SOURCE_BRANCH, TARGET_PROJECT, TARGET_BRANCH = integration.split(':') %}
      {% if SOURCE_BRANCH == CI_MERGE_REQUEST_TARGET_BRANCH_NAME || {% if SOURCE_BRANCH == CI_MERGE_REQUEST_TARGET_BRANCH_NAME or
      SOURCE_BRANCH == CI_COMMIT_REF_NAME %} SOURCE_BRANCH == CI_COMMIT_REF_NAME %}
      {{ TARGET_PROJECT }}:{{ TARGET_BRANCH }}: {{ TARGET_PROJECT }}:{{ TARGET_BRANCH }}:
      ......
      0% or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment