From c7f8bf0db4e4eecc12b5710fb0f9c8bfceba4e2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20H=C3=B6ppner?= <jonas.hoeppner@garz-fricke.com>
Date: Tue, 29 Mar 2022 15:16:19 +0200
Subject: [PATCH] CI: Integration job is now optional, remove check job
---
.gitlab-ci.yml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f234782..4cb439f4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -101,6 +101,8 @@ yamllint:
stage: integrate
rules:
- if: $CI_MERGE_REQUEST_IID
+ when: manual
+ allow_failure: true
script:
- cd ${CI_PROJECT_DIR}
- ./deploy_gitlab_ci.py
@@ -138,6 +140,7 @@ trigger-yocto:
stage: integrate
rules:
- if: $CI_MERGE_REQUEST_IID
+ allow_failure: true
needs: [integrate-yocto]
trigger:
include:
@@ -163,6 +166,8 @@ trigger-ci-test:
stage: merge
rules:
- if: $CI_COMMIT_BRANCH == "master"
+ when: manual
+ allow_failure: true
script:
- cd ${CI_PROJECT_DIR}
- ./merge_gitlab_ci.py
@@ -188,7 +193,10 @@ merge-yocto:
# --------------------------------------------------------------------------------------
check:
stage: check
+ needs: [integrate-yocto, integrate-ci-test]
rules:
+ # Probably this job gets removed
+ - when: never
- if: $CI_MERGE_REQUEST_IID
tags:
- infrastructure
--
GitLab