From 8a38f19499ac4da8b34d66c04fd47fef771f3aa9 Mon Sep 17 00:00:00 2001
From: Tim Jaacks <tim.jaacks@garz-fricke.com>
Date: Mon, 29 Aug 2022 12:32:35 +0200
Subject: [PATCH] Put all manifest intgeration jobs into a single stage
---
manifest-integration-jobs.yml.jinja2 | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/manifest-integration-jobs.yml.jinja2 b/manifest-integration-jobs.yml.jinja2
index 50152974..ad0edb0b 100644
--- a/manifest-integration-jobs.yml.jinja2
+++ b/manifest-integration-jobs.yml.jinja2
@@ -16,10 +16,6 @@ workflow:
stages:
- infrastructure
- - integrate
- - merge
- - build
- - check
# --------------------------------------------------------------------------------------
# Stage: infrastructure
@@ -59,7 +55,6 @@ yamllint:
# --------------------------------------------------------------------------------------
merge:
extends: .infrastructure
- stage: merge
rules:
- if: $CI_COMMIT_BRANCH == $SOURCE_BRANCH
script:
@@ -82,7 +77,8 @@ merge:
# Stage: build
# --------------------------------------------------------------------------------------
build:
- stage: build
+ stage: infrastructure
+ needs: ["integrate"]
rules:
# Do not run build if the "skip build" label is set on the merge request
- if: $CI_MERGE_REQUEST_LABELS =~ /skip build/
@@ -100,7 +96,6 @@ build:
# --------------------------------------------------------------------------------------
check:
extends: .infrastructure
- stage: check
rules:
# Do not run check if the "skip build" label is set on the merge request
- if: $CI_MERGE_REQUEST_LABELS =~ /skip build/
--
GitLab