From a77c2debd8ab891b413ad9147cf3908a3ab5db1c Mon Sep 17 00:00:00 2001
From: guf-gitbot <gitbot@garz-fricke.com>
Date: Fri, 1 Apr 2022 08:18:35 +0000
Subject: [PATCH] Integrate gitlab-ci/CI-fix-integrate-into-manifest and 4 more
--
Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/3318487d518476135ce978fe3fa3a113ca29295f
CI: integrate_into_manifest: Fix bug introduced when splitting functions
--
Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/4c74c580f08a1432d7bd89cf2967abbb7e071bf4
CI: disable 'check' job for gitlab-ci integration as integrate is already disabled
--
Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/5d1fb5c4a3613690375c76cb97204eddf9dcd4ac
CI: Enable MR pipeline for integration of gitlab-ci again
Our settings refuse to merge if no pipeline has been run.
--
Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/69d604a4fe09fefe779eb1599da7ff29d86c7c0c
CI: Fix merge pipeline
--
Commit: https://gitlab.com/SECO-Northern-Europe/yocto/infrastructure/gitlab-ci/-/commit/31d6d7dad54ab322345a6f44b3ff913341500f1c
CI: deploy_gitlab_ci: Rework the deployment of gitlab-ci into the child projects
The deploy_gitlab_ci now creates the integration commit and branch in
each passed subproject and create an integration commit in the manifest
containing all these new revisions.
A build is then triggered on this commit to test the functionality.
Split the update_submodule functions to reuse them in different ways.
Remove some previously used files.
BCS 746-000740
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 2 +-
SRCREV.conf | 26 +++++++++++++-------------
default.xml | 6 +++---
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index 0a7d845e..3318487d 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit 0a7d845ea64bf85363f1ce58229223bb0f9ac0d1
+Subproject commit 3318487d518476135ce978fe3fa3a113ca29295f
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 951bdb62..d388acdb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,5 +4,5 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: 0a7d845ea64bf85363f1ce58229223bb0f9ac0d1
+ ref: 3318487d518476135ce978fe3fa3a113ca29295f
file: 'manifest.yml'
diff --git a/SRCREV.conf b/SRCREV.conf
index 84c23be1..4e6cda27 100644
--- a/SRCREV.conf
+++ b/SRCREV.conf
@@ -1,13 +1,13 @@
-SRCREV_pn-gf-productiontests = "669e05745721bbaf2faef24dc210ea02941fc345"
-SRCREV_pn-gfeeprom = "5e4e468baef7ab26e35245a1d8a1c14cd155f410"
-SRCREV_pn-guf-show-demo = "824a977affae387dc6d679cf982fc4a707b6f124"
-SRCREV_pn-libmdb = "6b5a75263c091656d56f4874331238d2525d0cf5"
-SRCREV_pn-ltp-guf-tests = "e52e885b322e483f32047ec590fcf2be630e1582"
-SRCREV_pn-touchcal-conv = "935f27e4baa956d672103b418b3a065596c75934"
-SRCREV_pn-gfxml2dto = "018eb8ccf2839bdea80fb66b4ec547799f615d92"
-SRCREV_pn-egalaxi2c = "412c7f4c2dc7fc0d846b386c9059e201f173fb10"
-SRCREV_pn-gfplatdetect = "6adc56a24baf6c271285b0c3fba0718189e2e1e1"
-SRCREV_pn-xconfig = "bfe41d00162070263a30f75baa3417de745efa19"
-SRCREV_pn-linux-guf = "ad0b8e7603bdfedd54e1c1d47ee84cd418cade5c"
-SRCREV_pn-linux-imx-kuk = "fe2aac26c47e563928877ebff243c5a657b2f1e5"
-SRCREV_pn-u-boot-imx = "e86d5289f32b1ed168f071cfa2126c4a9e39b742"
+SRCREV_pn-gf-productiontests = "e40f4e102f93565e58dc5ac45aca26a6a584cc71"
+SRCREV_pn-gfeeprom = "64877c1708bb2142851900ea605833ad2f5817ee"
+SRCREV_pn-guf-show-demo = "065938103e645aa8febeabab87d8089635aee301"
+SRCREV_pn-libmdb = "a2394fd92ae9d2f8404ce15cf5c4cafe44011ee8"
+SRCREV_pn-ltp-guf-tests = "2fdacdcd981cf1214ac606b3ec54f9c58225b134"
+SRCREV_pn-touchcal-conv = "fe9fb326d00c68b6eb7b8d89ca6cb820748c275f"
+SRCREV_pn-gfxml2dto = "bb3331e4cc0fe07b2c4f1de04f1e3fbfcb150efa"
+SRCREV_pn-egalaxi2c = "61045718258d312c890c226361f7b6420d857d5b"
+SRCREV_pn-gfplatdetect = "071d42f7cd038adcb5f5429097df5b5f7cfb2ef8"
+SRCREV_pn-xconfig = "2ac3612bec1faef560416bc00ee3dd732ba25c5b"
+SRCREV_pn-linux-guf = "1873664cb3553ea1b34dbe2d120edf29d6e9c641"
+SRCREV_pn-linux-imx-kuk = "5e589e517f0d68b784b33345698193f08cb895a1"
+SRCREV_pn-u-boot-imx = "b66573a77f5bd7cf44fa7cf597c45a03afdf0d9d"
diff --git a/default.xml b/default.xml
index bf68eb9e..71b815b8 100644
--- a/default.xml
+++ b/default.xml
@@ -23,9 +23,9 @@
<project name="meta-qt5.git" revision="10f3673fd4b6c6e1e61c23478802f83652475a5f" remote="qt5-github" path="sources/meta-qt5" />
<project name="meta-freescale.git" revision="5a026be5a6b29a27a7754d7fa5d4765c99f98ed9" remote="fslc" path="sources/meta-freescale" />
<project name="meta-freescale-distro.git" revision="5d882cdf079b3bde0bd9869ce3ca3db411acbf3b" remote="fslc" path="sources/meta-freescale-distro" />
- <project name="layers/meta-guf-machine" revision="d562ac8b534231ab18433c26913b865b335e4cb4" remote="seco-north" path="sources/meta-guf-machine" />
- <project name="layers/meta-guf-distro" revision="fa9c464863455803055ff0e98982e826ce241ade" remote="seco-north" path="sources/meta-guf-distro" />
- <project name="config" revision="bd8e0bb75d94e5180ac2897bfb0b040ad2bca575" remote="seco-north" path=".conf">
+ <project name="layers/meta-guf-machine" revision="8209ad1ce4d80f4553338ea044c598749e471f1b" remote="seco-north" path="sources/meta-guf-machine" />
+ <project name="layers/meta-guf-distro" revision="d0977e95d7925b5f4e0b80f9f8af3e25ec4dcd23" remote="seco-north" path="sources/meta-guf-distro" />
+ <project name="config" revision="d4da4ca5396241d5f14d73d18b2c69d1ce3b6c4b" remote="seco-north" path=".conf">
<linkfile dest="setup-environment" src="setup-environment"/>
</project>
</manifest>
--
GitLab