From a90bf80dbdd16fa3be10aec9dabdf8e09e218491 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Tue, 31 May 2022 15:39:09 +0000
Subject: [PATCH] Integrate gitlab-ci/allow-check-job-to-fail and 1 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/ad9d367e52a0f364f4a3559e5b5005ec554110cb
Allow check job to fail
This makes merging a project MR possible even if the manifest has
received new commits since the MR pipeline build has run. The developer
is responsible for deciding whether it is safe to merge it without
having a build based on the latest manifest.
BCS 746-000794
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/81c2ad857633f9089b0ae8f0a173cf4c282a2e5c
merge_into_manifest: fix error message if MR already exists
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index 6fbbf3388fee9..ad9d367e52a0f 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit 6fbbf3388fee9045aea7bb4aab77700895119ff1
+Subproject commit ad9d367e52a0f364f4a3559e5b5005ec554110cb
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1803ce3e62705..38f41291db4cd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: 6fbbf3388fee9045aea7bb4aab77700895119ff1
+ ref: ad9d367e52a0f364f4a3559e5b5005ec554110cb
file: 'manifest-integration.yml'
variables:
--
GitLab