From 0b421f49dd92061d01ac3670d2a65bc39b247a52 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Thu, 7 Sep 2023 10:16:03 +0000
Subject: [PATCH] Integrate gitlab-ci/add-build-version-job and 6 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/372d192b9154ac48be662b83f66895671d91dd98
Use RELEASE_VERSION and RELEASE_NAME from build-version job
Instead of passing these variables from stage to stage or regenerating
their values in later stages, use the ones set in the build-version job
at all places.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/cad30c200f9780f4f6c74dcb9e24d46c0422960b
Remove RELEASE_SUFFIX variable
The RELEASE_NAME variable can be set directly now, so there's no need to
have a dedicated RELEASE_SUFFIX anymore. A previous configuration like
RELEASE_SUFFIX: "-custom"
can now be achieved using:
RELEASE_NAME: "Yocto-${RELEASE_VERSION}-custom"
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/922f49f8a5bc2f36720fa14d3acde6285a6376b1
Add yocto version job
This adds a machine-independent job "build-version" which populates the
RELEASE_VERSION and RELEASE_NAME variables, so that following jobs can
use these without depending on the various build jobs.
The variables can be set from the trigger job in a project's
`.gitlab-ci.yml` file. They are eval'ed before saving them to
version.env, so we can use deferred variable expansion or even command
execution to construct their values. This mechanism is already used for
the Flash-N-Go System variables.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/073ae81e71d957092723f6f91f4b99bb8d1d9e68
LAVA: rename MACHINE to LAVA_MACHINE
Rename variable in order to avoid confusion with the original MACHINE
variable used everywhere else. Also rename the local Jinja2 variable to
include an underscore to make naming consistent.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/a91baa55c16eb86ffe5d0b440963e99198b15209
Clean build.env before writing
This had been accidentally removed in
5e36715ef6cf98df4c1b98fedddc0c3c50ed4040.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/1860ca8ec2942c3db92416cf469e2e41bcb0f9e9
Remove LOG_PREFIX variable
This was used in times when the same code was executed from different
places. We don't do that anymore, so the variable is obsolete.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/3d2dbe4dc21e4801ccb3edc22dff9b021d93e8a8
Documentation: update job generation chapter
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
SRCREV.conf | 42 +++++++++++++++++++++---------------------
default.xml | 8 ++++----
4 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index 17b87f84..372d192b 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit 17b87f84e71a326169355a10f896f30924661adc
+Subproject commit 372d192b9154ac48be662b83f66895671d91dd98
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a47f5b8..2af661ed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,13 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: 17b87f84e71a326169355a10f896f30924661adc
+ ref: 372d192b9154ac48be662b83f66895671d91dd98
file: 'manifest-pipeline-yocto.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH: kirkstone
- GITLAB_CI_REVISION: 17b87f84e71a326169355a10f896f30924661adc
+ GITLAB_CI_REVISION: 372d192b9154ac48be662b83f66895671d91dd98
generate-build-pipeline:
variables:
diff --git a/SRCREV.conf b/SRCREV.conf
index 869da683..9f22fabf 100644
--- a/SRCREV.conf
+++ b/SRCREV.conf
@@ -1,22 +1,22 @@
-SRCREV:pn-atmel-mxt = "570012710f958b5796257efbef352d7ca866d05f"
-SRCREV:pn-egalaxi2c = "c61b4cf9abf21a9dadf74fbaf5b96cc6dd0c115d"
-SRCREV:pn-emc-test-suite = "f4273a263127e68b036b54283bf92b4ccf6a19d7"
-SRCREV:pn-gf-productiontests = "a4c93d3089e6afcccedb438bb0ae248d52abc12a"
-SRCREV:pn-gfeeprom = "159001be61ad9c6cc366b45c7b27b04da3b3d931"
-SRCREV:pn-gfplatdetect = "b2aabe86ca1c80c20eb596a95426311297695599"
-SRCREV:pn-gfxml2dto = "944d7e67ba7a2551d1beed8cf301d055cb999549"
-SRCREV:pn-ilitek = "8babee1512327aadf66931235b557dad04c825b4"
-SRCREV:pn-kernel-module-touchgpio = "9a60317f8fd2d16af2affc0e56a4536c0c9456ba"
-SRCREV:pn-libmdb = "0f3c046628dab6ef37578d19e244b605b88b9730"
-SRCREV:pn-linux-imx = "cce9267e8f75a52c022f82217f96e2b536273b5c"
+SRCREV:pn-atmel-mxt = "33834ee27e1e75825b4d68664fbfa04a5b14501e"
+SRCREV:pn-egalaxi2c = "f96054c4057d905fd66fb4ef6a6f84cf19c4cc07"
+SRCREV:pn-emc-test-suite = "cb660c9237cc0d53b51f561b36a7d74f847092e1"
+SRCREV:pn-gf-productiontests = "96a6e4227690d271d2f5c0e006de1a170bb92940"
+SRCREV:pn-gfeeprom = "2b4e1f19d04d1d1bdb1b391c1ce508440e60f07b"
+SRCREV:pn-gfplatdetect = "bb47538b9a123c4607c4ead6ee0ffa25fd27d410"
+SRCREV:pn-gfxml2dto = "7f9a54cf033b7b10347f1f930de62172d12d02ed"
+SRCREV:pn-ilitek = "8555fe120085b3136384c0b592ad08cf4b9577a7"
+SRCREV:pn-kernel-module-touchgpio = "0ae5f0f6b2768de00b0fd0a1d910522a1364ad89"
+SRCREV:pn-libmdb = "1f2b52fee64153f0acdeafc9640bfbeb33bbd300"
+SRCREV:pn-linux-imx = "bcf86b3f0b9db11f21e6ccd3c4616d05fbc7aedd"
SRCREV:pn-linux-imx-kuk = "0258f07c61364958e3307da11a388e72baffb03a"
-SRCREV:pn-linux-seconorth = "48b76fd84e06a4bba390cc8c6341e497c78e46e8"
-SRCREV:pn-qt-multi-screen-compositor = "70c37619ecd9851dfc32b41a6487610721388c68"
-SRCREV:pn-seco-sharedconf = "4a6112196cf909afa8f4a22ae4cbef6c81779d35"
-SRCREV:pn-seco-show-demo = "5b1e9655661e3d84c8d21e2a759ea4b1048c36c5"
-SRCREV:pn-seco-yocto-testsuite = "31339756d40a0ab5059c14585feb843b0d23cebe"
-SRCREV:pn-secure-element-examples = "12f4905c0bb195ebd742d8e5ba85a6e6ed08ac2c"
-SRCREV:pn-touchcal-conv = "8a2b0e0844661905b8b406cf016da0e5285b8149"
-SRCREV:pn-u-boot-seco-imx = "4d1e06887c56e38f2585d0c6e8da5c311c5b33f3"
-SRCREV:pn-xconfig = "597c75f61dd0d604247a5087329bc77639927bad"
-SRCREV:pn-yocto-install = "66b954442fab19116746dbb97f39be8f723a90c2"
+SRCREV:pn-linux-seconorth = "6d86ca5ddc0c8181cdae4ed2655fd88ac42b6631"
+SRCREV:pn-qt-multi-screen-compositor = "7e9bacf88ff295d3d74705e04ced837ead8ec23f"
+SRCREV:pn-seco-sharedconf = "48844410a1bf13453dcad5666151e1d80cf4602e"
+SRCREV:pn-seco-show-demo = "7587d1c819586e871dbc916ecdf32da950f85f7f"
+SRCREV:pn-seco-yocto-testsuite = "bd45cb29ee481d04f3a2e4f99d84d97afb08cac0"
+SRCREV:pn-secure-element-examples = "702bace6ea42899b4fc61c53592c4e1b0c58dbfe"
+SRCREV:pn-touchcal-conv = "663a3d46c054aa6db73aef9e70c8f6fa1abab4f4"
+SRCREV:pn-u-boot-seco-imx = "481814f51e0a14085d3b53d1c2a0941039ffa673"
+SRCREV:pn-xconfig = "47ae1b91254d89dd810864dcf970963843b858bb"
+SRCREV:pn-yocto-install = "a0865104c38e7741f7e2262dc89f68b3eda44b1d"
diff --git a/default.xml b/default.xml
index 58cb705d..ac067664 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="aeb1509b8b0e7bfb5719c3264fb8183f7ced7d1b" remote="seco-ne" path="sources/meta-seconorth-machine" />
- <project name="layers/meta-seconorth-distro" revision="1146c5fb61f030def9f4b3918c3ec5dccb5e1d39" remote="seco-ne" path="sources/meta-seconorth-distro" />
- <project name="layers/meta-seconorth-nogplv3" revision="a1d540c627d6084c35da405a9a27798a2ed66fc7" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
- <project name="config" revision="edf6b42d151cd5c30dbe1b1820259b9711251cf1" remote="seco-ne" path=".conf" >
+ <project name="layers/meta-seconorth-machine" revision="29a7e82b1c49cb1c48be1387447add334a40a602" remote="seco-ne" path="sources/meta-seconorth-machine" />
+ <project name="layers/meta-seconorth-distro" revision="f788ccf8e96e00fd48e73e99cc46935dd0dc0bfd" remote="seco-ne" path="sources/meta-seconorth-distro" />
+ <project name="layers/meta-seconorth-nogplv3" revision="07953d05b9a2fe35d67ac76e5f5af043d9aff4d6" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
+ <project name="config" revision="055717836bdfd2709350f1822eb42199af6bbec8" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
</project>
--
GitLab