From 9ee19c99914daad6cfd1ccb8a91040e543dc855b Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Fri, 6 May 2022 13:47:10 +0000
Subject: [PATCH] Integrate gitlab-ci/fix-reuse-of-outdated-integration-branch
 and 2 more

--

Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/bcb6076bc67279ac451d5d0d3449bbc89c4830d6

CI: Add check if integration branch is on top of target branch before reusing it

The integration branch was reused even if there where new commits on the
target branch, which could lead into reverting some changes.
This adds a check, if the existing integration branch is directly based
on the target branch and deletes it if not.

--

Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/3b5e9be0f5548af8ad42ab9b2701b7804c4cada6

CI: Pull new changelog_generator image, add token to the call.

BCS 746-000785

--

Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/968886c04551d2dc5ee9d82298cd3f9d448402bf

Update README.md: Add description on the gitlab-ci CI and how to deploy
---
 .gitlab-ci     | 2 +-
 .gitlab-ci.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci b/.gitlab-ci
index f2b7ec90..bcb6076b 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit f2b7ec9024a50695f1e4daa3e4b52fe27112d96f
+Subproject commit bcb6076bc67279ac451d5d0d3449bbc89c4830d6
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3a5b9f5a..0a02c9b5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@
 # ---------------------------------------------------------------------------------------
 include:
   - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
-    ref: f2b7ec9024a50695f1e4daa3e4b52fe27112d96f
+    ref: bcb6076bc67279ac451d5d0d3449bbc89c4830d6
     file: 'manifest-integration.yml'
 
 variables:
-- 
GitLab