From affc681c311b967ff1e510a1a35932e8b4afd4ff Mon Sep 17 00:00:00 2001
From: gitbot <gitbot.north@seco.com>
Date: Mon, 30 Sep 2024 12:38:04 +0000
Subject: [PATCH] Integrate
gitlab-ci/yt-160-gitlab-ci-integration-often-fails-on-merge-yocto-step
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/ff906931bfb8018298518f539b73f4107abe7e7b
YT-160: Workaround to prevent CI integration failure in 'merge-yocto' step
The GitLab CI integration job frequently fails on the 'merge-yocto' step,
specifically at the "git fetch" stage.
The issue occurs because Git fails to fetch the .gitlab-ci submodule
due to an incorrect reference, likely caused by the shallow clone
(--depth=1) configuration, which limits the commit history.
Extending the clone depth to --depth=2 helps prevent this error
by providing a slightly deeper commit history,
which resolves the reference issue.
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index f0ed0f4f..ff906931 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit f0ed0f4fd8cea2d0c76aabc102c68bf89fe96fbc
+Subproject commit ff906931bfb8018298518f539b73f4107abe7e7b
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 17297d77..ac3b755c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,8 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: f0ed0f4fd8cea2d0c76aabc102c68bf89fe96fbc
+ ref: ff906931bfb8018298518f539b73f4107abe7e7b
file: 'manifest-integration.yml'
variables:
- GITLAB_CI_REVISION: f0ed0f4fd8cea2d0c76aabc102c68bf89fe96fbc
+ GITLAB_CI_REVISION: ff906931bfb8018298518f539b73f4107abe7e7b
--
GitLab