From dfb7d6d6cb74ef8f6a85ce24d40e9b80e15fdb61 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Fri, 11 Aug 2023 18:16:34 +0000
Subject: [PATCH] Integrate gitlab-ci/use-multiple-ci-test-pipelines
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/b20f6b95e2c8dca7d6c4a621259ff22ee5d62dd4
Use multiple CI test pipelines
Instead of mixing dedicated CI test jobs and Yocto build simulation jobs
within one pipeline, use the new multi-build-pipelines architecture to
split them up into separate child pipelines.
This also makes most of the Yocto pipeline code reusable, so that we
don't have to declare all the jobs again in ci-test.
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
SRCREV.conf | 36 ++++++++++++++++++------------------
default.xml | 8 ++++----
4 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index f9dc2517..b20f6b95 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit f9dc2517c7e05077cfb0d93acc5269ba684c3f6a
+Subproject commit b20f6b95e2c8dca7d6c4a621259ff22ee5d62dd4
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 27332e7f..604c4b28 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,13 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: f9dc2517c7e05077cfb0d93acc5269ba684c3f6a
+ ref: b20f6b95e2c8dca7d6c4a621259ff22ee5d62dd4
file: 'manifest-pipeline-yocto.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH: kirkstone
- GITLAB_CI_REVISION: f9dc2517c7e05077cfb0d93acc5269ba684c3f6a
+ GITLAB_CI_REVISION: b20f6b95e2c8dca7d6c4a621259ff22ee5d62dd4
generate-build-pipeline:
variables:
diff --git a/SRCREV.conf b/SRCREV.conf
index 5dab10af..6e8ae43b 100644
--- a/SRCREV.conf
+++ b/SRCREV.conf
@@ -1,22 +1,22 @@
SRCREV:pn-atmel-mxt = "9dc5f338bd0fd410772d53d8a22b8dee78572b66"
-SRCREV:pn-egalaxi2c = "f5b41241794cfbd0bab47e2c698f24a56bb9a676"
-SRCREV:pn-emc-test-suite = "ef80972a09a3b7db1079ae4a778acf38d4e047e6"
-SRCREV:pn-gf-productiontests = "b252618ab3366ff3687979d19465fb70da7ddeab"
-SRCREV:pn-gfeeprom = "7419a00e4ca2d2567c3e6b9b7d2ea331fc6523cf"
-SRCREV:pn-gfplatdetect = "16cb8a451c3454bdaac1c542c7755006be25201b"
-SRCREV:pn-gfxml2dto = "de8c55a62218a191f84b6bf6722446e4d96cf13e"
+SRCREV:pn-egalaxi2c = "0fcbf4ad1d18b7c2e2c632e2c41da0dc8ce439dc"
+SRCREV:pn-emc-test-suite = "5fa51c6a3d4057eb14b701a2727dc4879f9bc670"
+SRCREV:pn-gf-productiontests = "313973ed68b7ef122107b9ad265f7699a3e766c3"
+SRCREV:pn-gfeeprom = "7e48841d34f57276a5038e03a0a361b3b6ee796d"
+SRCREV:pn-gfplatdetect = "8fd62c70cfb9ee30fb446c84701e79afe81f7f89"
+SRCREV:pn-gfxml2dto = "3930739fe8fd2d8aa179ebee5d94b0e18659d1ce"
SRCREV:pn-ilitek = "a74fba8cc783cfeeb771040a5fe669071183c139"
SRCREV:pn-kernel-module-touchgpio = "0823903ee1552e30477d7db942401af05ea5424a"
-SRCREV:pn-libmdb = "091c240516b4e139836b97401d22bfe380d9ad03"
-SRCREV:pn-linux-imx = "ac0bc631f8aad39b901e033161898aedc7b6e496"
+SRCREV:pn-libmdb = "8c32feca05506fbd85c5a1447ef7aecc23766062"
+SRCREV:pn-linux-imx = "cab5608ef95d1eae2b267693828ac778b9d64443"
SRCREV:pn-linux-imx-kuk = "0258f07c61364958e3307da11a388e72baffb03a"
-SRCREV:pn-linux-seconorth = "7949447622cc0e2b2c800ffb08068d373ba57564"
-SRCREV:pn-qt-multi-screen-compositor = "cb0b2cd7de62ff8866ae7153e9ff467cc4d96204"
-SRCREV:pn-seco-sharedconf = "280bae1b7015ce7ecd30c6c15a5559b4064eacf2"
-SRCREV:pn-seco-show-demo = "036aa9f3b3c51c1c0162fb33fdc4508d3c1f03f8"
-SRCREV:pn-seco-yocto-testsuite = "96188464b15e78a8c95c71fdbb461d7ba0e9df64"
-SRCREV:pn-secure-element-examples = "8151ade123373d7b2ac3c57079676fb7015b3a0d"
-SRCREV:pn-touchcal-conv = "40e9f602bf34908efbee4a62ab5335d86c7dbd61"
-SRCREV:pn-u-boot-imx = "e7e817c6fb8ad41df0f9b0012d38e239059c3076"
-SRCREV:pn-xconfig = "7e5a398fddde1a174b8ccf741fbba36e723fd242"
-SRCREV:pn-yocto-install = "e507604d41afbcab4a2fae3b153c3ffd0528b11e"
+SRCREV:pn-linux-seconorth = "548b26269a2d6fb82e61eaa04a82e72611820e57"
+SRCREV:pn-qt-multi-screen-compositor = "43ff1d19586a1bd430d1b3bddbed06c9c0bbb0d6"
+SRCREV:pn-seco-sharedconf = "98490cd94188f60e9224e96c187fb1f29561ac77"
+SRCREV:pn-seco-show-demo = "88c0472e80a1d90fa3e659116e16b4a8759f2cb6"
+SRCREV:pn-seco-yocto-testsuite = "f1c1b4cd3432a1d49fda7694377c42a0c7b98408"
+SRCREV:pn-secure-element-examples = "61780af984de4ae7b19951f1b9c7e2bb048f5a38"
+SRCREV:pn-touchcal-conv = "850eda00c9b9fcb469fadd046ebbf80433630d60"
+SRCREV:pn-u-boot-imx = "68d85a08a96daf650966b2b4ac1aa1c2176e73d6"
+SRCREV:pn-xconfig = "1634d133155ec10fbf5bb1bdef3b02595665c2cf"
+SRCREV:pn-yocto-install = "51d5706943f6dea16315068f6e7b79521da12b40"
diff --git a/default.xml b/default.xml
index cfb29b97..9913bea3 100644
--- a/default.xml
+++ b/default.xml
@@ -21,10 +21,10 @@
<project name="meta-qt5.git" revision="5b71df60e523423b9df6793de9387f87a149ac42" remote="qt5-github" path="sources/meta-qt5" />
<project name="meta-freescale.git" revision="dd98526300937450d741c9b3403799632f417226" remote="fslc" path="sources/meta-freescale" />
<project name="meta-freescale-distro.git" revision="fc15f5003043da23212596be7366ae2547c308ad" remote="fslc" path="sources/meta-freescale-distro" />
- <project name="layers/meta-seconorth-machine" revision="f7305910e2721a065cc8c8d8b85f9e6ae28e2ca1" remote="seco-ne" path="sources/meta-seconorth-machine" />
- <project name="layers/meta-seconorth-distro" revision="4cab641d68a89b299c33bc5dd7f4975705052143" remote="seco-ne" path="sources/meta-seconorth-distro" />
- <project name="layers/meta-seconorth-nogplv3" revision="d2bdcd89576bcd7cfdb59fcb6c83c4d38e214752" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
- <project name="config" revision="3d33210f5001dc5494937133a0981c29b8ad0c66" remote="seco-ne" path=".conf" >
+ <project name="layers/meta-seconorth-machine" revision="310f94ee323808d9eab854d0b2281c7e27460fab" remote="seco-ne" path="sources/meta-seconorth-machine" />
+ <project name="layers/meta-seconorth-distro" revision="53021e05364566b8e0e1e6d9d174c815305e4664" remote="seco-ne" path="sources/meta-seconorth-distro" />
+ <project name="layers/meta-seconorth-nogplv3" revision="888b13616fb39e49756583e30197560ff305b6ec" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
+ <project name="config" revision="e5e1352011b9392d3222e142483ff8df06df51a1" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
</project>
--
GitLab