From 5d1fb5c4a3613690375c76cb97204eddf9dcd4ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20H=C3=B6ppner?= <jonas.hoeppner@garz-fricke.com>
Date: Fri, 1 Apr 2022 09:19:16 +0200
Subject: [PATCH] CI: Enable MR pipeline for integration of gitlab-ci again
Our settings refuse to merge if no pipeline has been run.
---
foobar-manifest-integration.yml | 8 ++++----
manifest-integration.yml | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/foobar-manifest-integration.yml b/foobar-manifest-integration.yml
index 3fee862..978b287 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 18fe352..75de7e8 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.
--
GitLab