Skip to content
Snippets Groups Projects
Commit 5d1fb5c4 authored by Jonas Höppner's avatar Jonas Höppner
Browse files

CI: Enable MR pipeline for integration of gitlab-ci again 

Our settings refuse to merge if no pipeline has been run.
parent 69d604a4
No related branches found
No related tags found
1 merge request!123CI: Enable MR pipeline for integration of gitlab-ci again
Pipeline #9317 waiting for manual action with stages
Stage:
    Stage:
      in 49 seconds
      Hide whitespace changes
      Inline Side-by-side
      foobar-manifest-integration.yml
      + 4
      − 4
      View file @ 5d1fb5c4
      ...@@ -38,10 +38,6 @@ workflow: ...@@ -38,10 +38,6 @@ workflow:
      rules: rules:
      # Explicitly allow externally triggered pipelines in every case # Explicitly allow externally triggered pipelines in every case
      - if: $CI_PIPELINE_SOURCE == "pipeline" || $CI_PIPELINE_SOURCE == "api" - if: $CI_PIPELINE_SOURCE == "pipeline" || $CI_PIPELINE_SOURCE == "api"
      # Do not run pipelines for merge requests for integrate/gitlab-ci/ branches
      # These are trigger explicitly from the integration pipeline in gitlab-ci repo
      - if: $CI_COMMIT_REF_NAME =~ /^integrate\/gitlab-ci\/.*/
      when: never
      # Do not run pipelines on forked projects. # Do not run pipelines on forked projects.
      # The pipelines would not work anyway because of the users permissions. # The pipelines would not work anyway because of the users permissions.
      # There are two cases catched here: # There are two cases catched here:
      ...@@ -63,6 +59,10 @@ workflow: ...@@ -63,6 +59,10 @@ workflow:
      integrate: integrate:
      extends: .infrastructure extends: .infrastructure
      rules: rules:
      # Do not integration pipeline for merge requests for integrate/gitlab-ci/ branches
      # The integration is done from the pipeline in gitlab-ci already
      - if: $CI_COMMIT_REF_NAME =~ /^integrate\/gitlab-ci\/.*/
      when: never
      # We have to make sure that the pipeline runs for the current manifest # We have to make sure that the pipeline runs for the current manifest
      # master at the time a merge request is created. Otherwise we cannot # master at the time a merge request is created. Otherwise we cannot
      # guarantee a green master after merging. # guarantee a green master after merging.
      ......
      manifest-integration.yml
      + 4
      − 4
      View file @ 5d1fb5c4
      ...@@ -25,10 +25,6 @@ workflow: ...@@ -25,10 +25,6 @@ workflow:
      rules: rules:
      # Explicitly allow externally triggered pipelines in every case # Explicitly allow externally triggered pipelines in every case
      - if: $CI_PIPELINE_SOURCE == "pipeline" || $CI_PIPELINE_SOURCE == "api" - if: $CI_PIPELINE_SOURCE == "pipeline" || $CI_PIPELINE_SOURCE == "api"
      # Do not run pipelines for merge requests for integrate/gitlab-ci/ branches
      # These are trigger explicitly from the integration pipeline in gitlab-ci repo
      - if: $CI_COMMIT_REF_NAME =~ /^integrate\/gitlab-ci\/.*/
      when: never
      # Do not run pipelines on forked projects. # Do not run pipelines on forked projects.
      # The pipelines would not work anyway because of the users permissions. # The pipelines would not work anyway because of the users permissions.
      # There are two cases catched here: # There are two cases catched here:
      ...@@ -50,6 +46,10 @@ workflow: ...@@ -50,6 +46,10 @@ workflow:
      integrate: integrate:
      extends: .infrastructure extends: .infrastructure
      rules: rules:
      # Do not integration pipeline for merge requests for integrate/gitlab-ci/ branches
      # The integration is done from the pipeline in gitlab-ci already
      - if: $CI_COMMIT_REF_NAME =~ /^integrate\/gitlab-ci\/.*/
      when: never
      # We have to make sure that the pipeline runs for the current manifest # We have to make sure that the pipeline runs for the current manifest
      # master at the time a merge request is created. Otherwise we cannot # master at the time a merge request is created. Otherwise we cannot
      # guarantee a green master after merging. # guarantee a green master after merging.
      ......
      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