From b54d926f8618e3e766e3e5e24eb671b65c7c66cc Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@seco.com>
Date: Thu, 19 Oct 2023 08:54:20 +0000
Subject: [PATCH] Integrate
gitlab-ci/combine-confluence-pages-from-multiple-pipelines and 2 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/c292d1447f500262d733df620d291333ceed4a7b
Confluence: combine data from parallel child pipelines
We deploy Yocto image and SDK in different pipelines, which both have
their Confluence jobs with the same Confluence target. Previously these
pipelines have been independent, so that running the Confluence job in
one of them would overwrite the Confluence page if it has been run in
the other pipeline before. Hence we could either have the image files or
the SDK files in the Confluence page.
Combine these now by checking for other parallel child pipelines with
the same Confluence configuration, so that running the Confluence jobs
in the Yocto pipeline also includes the information from the SDK build
and vice versa.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/531061706cad0d1fd0ca9a4d970815c3bbd520b5
Fix ci-test SDK version
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/d6d4ab61d29fe2adc467776163b7475a3c4eafaf
Fix ci-test SDK download
Since the implementation of multiple child pipelines we cannot use the
previous artifacts download links anymore specifying tag and job name,
because the jobs for image build and SDK build are equal. Use direct
download links instead via job number.
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
SRCREV.conf | 24 ++++++++++++------------
default.xml | 8 ++++----
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index bc85e805..c292d144 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit bc85e805bc45e0cbbb3a896c73dec68b2bfd810d
+Subproject commit c292d1447f500262d733df620d291333ceed4a7b
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c79abf82..d705c259 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,13 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: bc85e805bc45e0cbbb3a896c73dec68b2bfd810d
+ ref: c292d1447f500262d733df620d291333ceed4a7b
file: 'manifest-pipeline-yocto.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH: dunfell
- GITLAB_CI_REVISION: bc85e805bc45e0cbbb3a896c73dec68b2bfd810d
+ GITLAB_CI_REVISION: c292d1447f500262d733df620d291333ceed4a7b
generate-build-pipeline:
variables:
diff --git a/SRCREV.conf b/SRCREV.conf
index 0bf89cfb..19bcd612 100644
--- a/SRCREV.conf
+++ b/SRCREV.conf
@@ -1,14 +1,14 @@
-SRCREV_pn-gf-productiontests = "35e2b8720cc379f598ed535cc569e650e2f96a95"
-SRCREV_pn-gfeeprom = "48fa0eabc987e12a94cecad0a35123beda3adc3d"
+SRCREV_pn-gf-productiontests = "9f52cac91273b3caa44172c9fedfaf2b3aad131f"
+SRCREV_pn-gfeeprom = "5d381236e4a8a63610dd80f8aae17651db7a427b"
SRCREV_pn-guf-show-demo = "dd131b8daf8023dea33165ab60c58d8f2e8f1f20"
-SRCREV_pn-libmdb = "8a267a4de8fe51c4ae557b4a4a587a6ca23b0d07"
-SRCREV_pn-ltp-guf-tests = "51f37839532d690a6d7526ff640513508bd605af"
-SRCREV_pn-touchcal-conv = "428ad68c82c0706ea70342e68dad23c48e36a52e"
-SRCREV_pn-gfxml2dto = "add2b8deade674a5d9b5e59e9f17d2688f238814"
-SRCREV_pn-egalaxi2c = "9d3c5e2b552e29e2cd5b032a987275c25b4dd1ff"
-SRCREV_pn-gfplatdetect = "0ca0f209256ec078cf8cefa7cd0534ba6b89e84b"
-SRCREV_pn-xconfig = "5b0219df42b799dce7a21ab229dcdfd4866bd81d"
-SRCREV_pn-linux-guf = "43facb8ae248129440b2e96908c60ad435e003fc"
-SRCREV_pn-linux-imx-kuk = "ced3649692710602ca784274746537e20dd753fd"
+SRCREV_pn-libmdb = "7cd10f6f28432c84861822fae5bf4eb9801c1a9e"
+SRCREV_pn-ltp-guf-tests = "b1b5213d9d4c4b59fd64424f9ef17445e0644b63"
+SRCREV_pn-touchcal-conv = "d42f9d4556e3d832be37f01d06bbd75684dbab5e"
+SRCREV_pn-gfxml2dto = "efba661c9d25f2fc1894f5f6011d79756f42180b"
+SRCREV_pn-egalaxi2c = "1abfaf0f46f0f31e030740cf55780c75d54f61f5"
+SRCREV_pn-gfplatdetect = "031a125fe53f2e3b80ee656f8f3c2bf71cf1204b"
+SRCREV_pn-xconfig = "f8f230309d8c2cf2a93ff622e216ae0ae168afef"
+SRCREV_pn-linux-guf = "a8c6441a4302a665817b41a884d4352c3eaea133"
+SRCREV_pn-linux-imx-kuk = "ed2a7768aa888d9ffa747daf18a952e6d071dd97"
SRCREV_pn-u-boot-imx = "a89b445ae46842ee508773052110807528403a47"
-SRCREV_pn-qt-multi-screen-compositor = "65eb343f0b12e6fa3602685b79d550fe03f86676"
+SRCREV_pn-qt-multi-screen-compositor = "c9b43c3a6082bdf6afff7c21868ff00a70de89dc"
diff --git a/default.xml b/default.xml
index 0c0ed684..58a27564 100644
--- a/default.xml
+++ b/default.xml
@@ -21,10 +21,10 @@
<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-seconorth-machine" revision="0cc004af110ccc8126901fb2b21d626da55be661" remote="seco-ne" path="sources/meta-seconorth-machine" />
- <project name="layers/meta-seconorth-distro" revision="3304d4953be6d7a287e176ea3509817018fda277" remote="seco-ne" path="sources/meta-seconorth-distro" />
- <project name="layers/meta-seconorth-nogplv3" revision="9f9716bc206f1b658d33e7fd89ec83931686aa1c" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
- <project name="config" revision="14c1d5a7941433e9968bb3c77a3fde94ebbe3a63" remote="seco-ne" path=".conf" >
+ <project name="layers/meta-seconorth-machine" revision="ab72d54b8e23b03a059e0c51bfee83f422264355" remote="seco-ne" path="sources/meta-seconorth-machine" />
+ <project name="layers/meta-seconorth-distro" revision="129670e0e5fd3ee774eefd9bc6229f4b287336ca" remote="seco-ne" path="sources/meta-seconorth-distro" />
+ <project name="layers/meta-seconorth-nogplv3" revision="5709a81cff1a7675aa527d1221a40b17e3ebd870" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
+ <project name="config" revision="c19d0bcf6c673526c1d2dc9b846428fd6b7ff36a" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
</project>
--
GitLab