From 7f08fde919a3f16e15d76e86f78930f5ecaf0e9a Mon Sep 17 00:00:00 2001
From: guf-gitbot <gitbot@garz-fricke.com>
Date: Mon, 4 Apr 2022 10:28:51 +0000
Subject: [PATCH] Integrate gitlab-ci/CI-fix-integration-with-srcrev and 3 more
--
Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/ab3189781f0b0e97c23c7719a5fdbccbf0c4db39
CI: integrate_into_manifest: Fix integration for recipes in SRCREV file
--
Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/976aaec9d9c6ef10defd4b3a7329d366452bd522
CI: deploy_gitlab_ci: Fix merge, integration branch was used after delete
--
Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/65c6f273b63e4d1beca064f6edb3073321fd5cea
CI: Rename foobar to ci-test, like the job names
--
Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/60c311abd4930bf490f13ab13bf2534e160bf842
CI: Reuse existing integration branch preserving manual changes
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index 3318487..ab31897 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit 3318487d518476135ce978fe3fa3a113ca29295f
+Subproject commit ab3189781f0b0e97c23c7719a5fdbccbf0c4db39
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5768584..a0e0bb2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,5 +4,5 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: 3318487d518476135ce978fe3fa3a113ca29295f
+ ref: ab3189781f0b0e97c23c7719a5fdbccbf0c4db39
file: 'manifest-integration.yml'
--
GitLab