From e191ae5634813ff63cdf3a70f6e321d52d0dba03 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot.north@seco.com>
Date: Mon, 30 Sep 2024 14:15:55 +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 ++--
SRCREV.conf | 48 ++++++++++++++++++++++++------------------------
default.xml | 10 +++++-----
4 files changed, 32 insertions(+), 32 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 8bff41e9..d374c975 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,13 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: f0ed0f4fd8cea2d0c76aabc102c68bf89fe96fbc
+ ref: ff906931bfb8018298518f539b73f4107abe7e7b
file: 'manifest-pipeline-yocto.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH: kirkstone
- GITLAB_CI_REVISION: f0ed0f4fd8cea2d0c76aabc102c68bf89fe96fbc
+ GITLAB_CI_REVISION: ff906931bfb8018298518f539b73f4107abe7e7b
# FIXME: For now we need a two-step variable assignment here due to a GitLab bug:
# https://gitlab.com/gitlab-org/gitlab/-/issues/273409
# Escaped variables are not correctly passed to child pipelines. Proposed workaround
diff --git a/SRCREV.conf b/SRCREV.conf
index f86106fb..22be885e 100644
--- a/SRCREV.conf
+++ b/SRCREV.conf
@@ -1,25 +1,25 @@
-SRCREV:pn-atmel-mxt = "1e75476108451d791db5e8d29833f2a2a8a8b853"
-SRCREV:pn-egalaxi2c = "4f4c02529d025f7c2c50613faa42e03a50b09e68"
-SRCREV:pn-emc-test-suite = "f40be4f18deeb20c36ae5e79030f8492173230b7"
-SRCREV:pn-gf-productiontests = "a7f36c79328451d50718cdc7604faff11899af82"
-SRCREV:pn-gfeeprom = "cd6a5ade96e68865aca97c9f7fa808c32d46edd1"
-SRCREV:pn-gfplatdetect = "4340185a0f6d70a66c4bb2b9b4657a907d9b245f"
-SRCREV:pn-gfxml2dto = "907933715d64d2c54738bb89f865e5b4e1c47e40"
-SRCREV:pn-ilitek = "a52a7e5265a20a3d08e9e5ba9b1fc38a923d69ec"
-SRCREV:pn-kernel-module-touchgpio = "75010597e4b8950f9b1d2c54db277551b3eb8a75"
-SRCREV:pn-libmdb = "bdbb2dce6229dd606f83bc20da2a5a85ee2cdc60"
-SRCREV:pn-linux-imx = "956dea2b5f8dcc47b317eb8bf4a2e1a2ce44c72b"
+SRCREV:pn-atmel-mxt = "a08c307167654c6236127df792465b68e9b530ca"
+SRCREV:pn-egalaxi2c = "11dc15d8d84a297a4fa93e39e649f0fbf2c01c97"
+SRCREV:pn-emc-test-suite = "e6d551b16d3ed98f545a05f56126a8a265727a3e"
+SRCREV:pn-gf-productiontests = "8eab46b3d4d1c2a7a7392f3dd4ede2a96ee39e48"
+SRCREV:pn-gfeeprom = "5933aa7570f8b29cf77e292158b2436350f40a68"
+SRCREV:pn-gfplatdetect = "5217e151e54aa88ba5258749a116d8ce30420790"
+SRCREV:pn-gfxml2dto = "0d29f27c8799a05eb8293557102ad2f49cff2396"
+SRCREV:pn-ilitek = "9afc2f4a1c380c01ff7ef938570ad7b730d2b5a1"
+SRCREV:pn-kernel-module-touchgpio = "2b3b4458853cfaeb6f2b1d7fc023583ce423ec0e"
+SRCREV:pn-libmdb = "db58d1eddd63616d2e3c9f1be0e440f1457b8e3d"
+SRCREV:pn-linux-imx = "8960265be858e2790c6c0a2857a31dcfad909501"
SRCREV:pn-linux-imx-kuk = "0258f07c61364958e3307da11a388e72baffb03a"
-SRCREV:pn-linux-seconorth = "de944f1931269819bbf48d6ce7fc507eef2e9ff3"
-SRCREV:pn-linux-seco-mtk = "09de24cdabdfa286ec9d76ef34c85c4304f47da7"
-SRCREV:pn-qt-multi-screen-compositor = "34eebfe7d53c594b03fa97061ed8497f430000cd"
-SRCREV:pn-seco-sharedconf = "65527d35a1a6da47fd34112b612485ecedd1704d"
-SRCREV:pn-seco-show-demo = "7c77c8497d922b9ca741df5e4eb8ac75a8d40c92"
-SRCREV:pn-seco-yocto-testsuite = "8224e01573f38d9d71fd59dbbe3630783a3aab1b"
-SRCREV:pn-secure-element-examples = "4a1345d72318a860b1e1b25f7d2aeae31bd82ed7"
-SRCREV:pn-touchcal-conv = "f94b16ad499ec927382ce4df5cb5aa47bd262a29"
-SRCREV:pn-u-boot-seco-imx = "9873f78bed8defc4f928c588009335c7cdf940e0"
-SRCREV:pn-u-boot-seco-mtk = "f2c4123023c08c4d57af4c779b84a3a630a34ed3"
-SRCREV:pn-xconfig = "b73393aaa08932a3ec293b392eebb9f51bcbf9c7"
-SRCREV:pn-yocto-install = "d442d8845ac630e0be4968b52234f602c7ffc668"
-SRCREV:pn-seco-stm32 = "88709b1270f297850e80637099c48f7eb3c7896b"
+SRCREV:pn-linux-seconorth = "58c11bd579defe81edfdecd43c2dfa10c762a60e"
+SRCREV:pn-linux-seco-mtk = "d509ebe77e4ccf12144fbbdba2ad6c24c742f8db"
+SRCREV:pn-qt-multi-screen-compositor = "f25c3401a04e68a16dfafbb46f761ab3fd82bc4c"
+SRCREV:pn-seco-sharedconf = "27a6fc2cfab70fee3bb5fe3be64d79dc3b828d40"
+SRCREV:pn-seco-show-demo = "8a7f85a5849d70b486d1f9382ba7d033ee26b766"
+SRCREV:pn-seco-yocto-testsuite = "36bbe6d1d741fcce5b2048ef8acc4b1296c33214"
+SRCREV:pn-secure-element-examples = "74eccff77b1e45590202804fd008bb77d7a15854"
+SRCREV:pn-touchcal-conv = "f43c8b9faec6e90441d5c2becf946ce73295b6d1"
+SRCREV:pn-u-boot-seco-imx = "464e7e3ffb0cddb5c10454223d7383884dda8984"
+SRCREV:pn-u-boot-seco-mtk = "8bff1bca2c667ba4bd93aba3db37de88b53c6f91"
+SRCREV:pn-xconfig = "cd55d046f62390427db5ec97e8bdc26ae160fede"
+SRCREV:pn-yocto-install = "f83c77773e9a994f7d6b3d4bf69c59ec8ab37da1"
+SRCREV:pn-seco-stm32 = "fe49bb6a9c790239f85d4ba807d7ad7cf0b7c88e"
diff --git a/default.xml b/default.xml
index c23955db..19c2568c 100644
--- a/default.xml
+++ b/default.xml
@@ -28,11 +28,11 @@
<project name="meta-mediatek-bsp.git" revision="048e2981c96b0e93896d540c53b789f8c93c7e6e" remote="rity" path="sources/meta-mediatek-bsp" />
<project name="meta-rity.git" revision="bc2393cf3c26a3db6da719a5e05d517c6fe01e6c" remote="rity" path="sources/meta-rity" />
<project name="meta-rauc.git" revision="804386f04826ea7fe74a1b4e0a20991425c06d9c" remote="rauc" path="sources/meta-rauc" />
- <project name="layers/meta-seconorth-machine" revision="86c2b53098df680d0b91b5bcd57f538a1fcbbdf3" remote="seco-ne" path="sources/meta-seconorth-machine" />
- <project name="layers/meta-seconorth-mtk" revision="4b906bd45ce60be851e7f25f85bd9f4b8453afea" remote="seco-ne" path="sources/meta-seconorth-mtk" />
- <project name="layers/meta-seconorth-distro" revision="1b3b4e258dccf6c4512481b8b43d5584ea40e41d" remote="seco-ne" path="sources/meta-seconorth-distro" />
- <project name="layers/meta-seconorth-nogplv3" revision="5a5d807bda99b87a9c8594e52a290a417f4f432c" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
- <project name="config" revision="dbe817a39a40440bac69a01cf0dfe7f7ac371942" remote="seco-ne" path=".conf" >
+ <project name="layers/meta-seconorth-machine" revision="18840261622d1183b309815069bb1dd4e8d57909" remote="seco-ne" path="sources/meta-seconorth-machine" />
+ <project name="layers/meta-seconorth-mtk" revision="5486b07bb4432e46fbc5e4e7b1eb16b4b4897574" remote="seco-ne" path="sources/meta-seconorth-mtk" />
+ <project name="layers/meta-seconorth-distro" revision="1c2e58dd0ba474bf0d104beb61e2a9b505f29f6a" remote="seco-ne" path="sources/meta-seconorth-distro" />
+ <project name="layers/meta-seconorth-nogplv3" revision="0a2de9130fd2922d4830a7c895d50a2271215c2c" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
+ <project name="config" revision="16ac773c5e206b6336e04d7e419031c72b523c6b" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
</project>
--
GitLab