diff --git a/foobar-manifest-integration.yml b/foobar-manifest-integration.yml index 3fee8622926f87f59deaaa80fa0feda1afbad6c6..978b287e2f3987d2eeade57d6ad59aa61aa67492 100644 --- a/foobar-manifest-integration.yml +++ b/foobar-manifest-integration.yml @@ -38,10 +38,6 @@ workflow: rules: # Explicitly allow externally triggered pipelines in every case - 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. # The pipelines would not work anyway because of the users permissions. # There are two cases catched here: @@ -63,6 +59,10 @@ workflow: integrate: extends: .infrastructure 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 # master at the time a merge request is created. Otherwise we cannot # guarantee a green master after merging. diff --git a/manifest-integration.yml b/manifest-integration.yml index 18fe3525874f8eabb0dfe1b33ef3e83f4911ba4a..75de7e8a23c28d50bdc34385679ae305adf00042 100644 --- a/manifest-integration.yml +++ b/manifest-integration.yml @@ -25,10 +25,6 @@ workflow: rules: # Explicitly allow externally triggered pipelines in every case - 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. # The pipelines would not work anyway because of the users permissions. # There are two cases catched here: @@ -50,6 +46,10 @@ workflow: integrate: extends: .infrastructure 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 # master at the time a merge request is created. Otherwise we cannot # guarantee a green master after merging.