From b095a587fda8c58be8e8aa98e63b6ebcf2ce105f Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Mon, 9 Jan 2023 13:30:07 +0000
Subject: [PATCH] Integrate gitlab-ci/remove-dynamic-job-generation
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/897ba05909d14939c1e044de8f71b95f0074534f
Manifest integration: remove dynamic job generation
The dynamic job was only necessary because GitLab did not expand
variables in the "trigger:project" keyword:
https://gitlab.com/gitlab-org/gitlab/-/issues/347469
This has been fixed in GitLab 15.3, so we don't need it anymore:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92346
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
SRCREV.conf | 28 ++++++++++++++--------------
default.xml | 8 ++++----
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index ea1f3bad..897ba059 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit ea1f3badfbab2167640774e38310c9251ada488b
+Subproject commit 897ba05909d14939c1e044de8f71b95f0074534f
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bcdf9a54..b7267050 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,13 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: ea1f3badfbab2167640774e38310c9251ada488b
+ ref: 897ba05909d14939c1e044de8f71b95f0074534f
file: 'manifest-pipeline-yocto.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH: dunfell
- GITLAB_CI_REVISION: ea1f3badfbab2167640774e38310c9251ada488b
+ GITLAB_CI_REVISION: 897ba05909d14939c1e044de8f71b95f0074534f
generate-build-jobs:
variables:
diff --git a/SRCREV.conf b/SRCREV.conf
index f395787e..049ebb55 100644
--- a/SRCREV.conf
+++ b/SRCREV.conf
@@ -1,14 +1,14 @@
-SRCREV_pn-gf-productiontests = "6201a96c914711818bd47e39d1fb9fbbfc3dac15"
-SRCREV_pn-gfeeprom = "088daca079266b1aa0a1b233448e7f708a6454a4"
-SRCREV_pn-guf-show-demo = "4f3b0c6cc9fe52cbf85c7a77060e29e7898c4387"
-SRCREV_pn-libmdb = "2b877654a4ba8b5eab37be4def6f4f5afb928cba"
-SRCREV_pn-ltp-guf-tests = "49f567f227e21289099b1ae09343c1d5b63fd6e0"
-SRCREV_pn-touchcal-conv = "f25d3c1e62dd032935baa61d8314fefd96fb0e84"
-SRCREV_pn-gfxml2dto = "a34fa74b284b027ad8607b90f0dcd309103e6211"
-SRCREV_pn-egalaxi2c = "dc4260a9f3b9e239e33128b8c980bbe2d1e53168"
-SRCREV_pn-gfplatdetect = "e6c772505e0aac0d4160756441beaf13a4b5b196"
-SRCREV_pn-xconfig = "8bd3cbee5833b727514abdde13d6242517f7e6a8"
-SRCREV_pn-linux-guf = "79e64edd12a7c1e6c2b6f51f6215d62fabe473f9"
-SRCREV_pn-linux-imx-kuk = "03a135b7e6a8028ed93fd8312c3e6b98cbd718a5"
-SRCREV_pn-u-boot-imx = "41c1301fb334417e2fe795bb532bbb15c9c1fef3"
-SRCREV_pn-qt-multi-screen-compositor = "231a5a01502f5e5dc2c9846b3f41418b3bd2a72f"
+SRCREV_pn-gf-productiontests = "a9530e1b762cfedf5dbbd32adf1121ac2405419f"
+SRCREV_pn-gfeeprom = "d454762d1251a1dc29f72ae5309e366f32f320e1"
+SRCREV_pn-guf-show-demo = "066f2c10cb0e713339e94adb6b1912d591fae910"
+SRCREV_pn-libmdb = "22c7be70f022ce40704dd9fe933d464b2d961824"
+SRCREV_pn-ltp-guf-tests = "938d5847e7c772f8d0d72ca7fa13e2be4fea7f66"
+SRCREV_pn-touchcal-conv = "ed893de4699e3922dac13ef8c5422d4dc680f669"
+SRCREV_pn-gfxml2dto = "a31b392d0b09b003e8a27b764ccfb791d8341727"
+SRCREV_pn-egalaxi2c = "7b648324263578bf56d3baeb7d0ce433d8b97527"
+SRCREV_pn-gfplatdetect = "a399186339648f6d00e35f54ee59a67a270d0cb9"
+SRCREV_pn-xconfig = "1a64d85ac545f8d7ba2b48cfb8c171cfc8a5f0a2"
+SRCREV_pn-linux-guf = "cb9651e1c3eb6c24b152f548287752f6f8635dd3"
+SRCREV_pn-linux-imx-kuk = "fdba5f3278bad581adfda59e56bd6c2dc7fa80c7"
+SRCREV_pn-u-boot-imx = "186986b9cba80a22d7337089ded32bdd9fdadf5e"
+SRCREV_pn-qt-multi-screen-compositor = "79a0429d8a187150f65290f1f4b279196ccafd35"
diff --git a/default.xml b/default.xml
index 90ce0a6a..eca63a11 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="90adb9e5bede7911f09b48b91092fcf261276198" remote="seco-ne" path="sources/meta-seconorth-machine" />
- <project name="layers/meta-seconorth-distro" revision="527be4d226b702a4ca52141cb59d6191e7a87657" remote="seco-ne" path="sources/meta-seconorth-distro" />
- <project name="layers/meta-seconorth-nogplv3" revision="78a1078cde3b0e921cc509e72b1b2a5e47184313" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
- <project name="config" revision="a8196fe1bd5e9153517696cb68bc6cab4a6e7c9f" remote="seco-ne" path=".conf" >
+ <project name="layers/meta-seconorth-machine" revision="cbda1e907282ce3ad6922e36d219a73b5e648992" remote="seco-ne" path="sources/meta-seconorth-machine" />
+ <project name="layers/meta-seconorth-distro" revision="dd2c60e1c1054edd2374ff4e686d40804b90b9b5" remote="seco-ne" path="sources/meta-seconorth-distro" />
+ <project name="layers/meta-seconorth-nogplv3" revision="5e34b7de11ade396b120d9bf061a6b1b8ae727e5" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
+ <project name="config" revision="9c99e8b65bd6bc75b65135d8a3f8a9c7ee008bed" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
</project>
--
GitLab