From 34ec84490260f77d2ce86b236035e222a32a4fc0 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Wed, 31 Aug 2022 07:45:22 +0000
Subject: [PATCH] Integrate gitlab-ci/fix-manifest-commit and 8 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/3eef782efc50e805fd4640281aa8039d8594720e
deploy_gitlab_ci: integrate only correct projects into the manifest
Previously we integrated all projects into the manifest, even those that
belonged to a different manifest branch. That led to all manifests
having the same project revisions, even if they should be different due
to different intgrated project branches.
Save a list of integration sources for each manifest branch separately
now, so that we can check which project belongs to which manifest branch
later.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/2b851ac66a1f5fdcb623d3ab5bbd8a34cb809f85
Fix potential error message in retrigger job
TypeError: 'NoneType' object is not subscriptable
Example:
https://git.seco.com/seco-ne/yocto/infrastructure/ci-test/minimal-manifest/-/jobs/127610
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/c3fd0ecc141c9247cdefcc197b731333c1f14da0
Check if variable is defined before checking it value
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/c1be0f4b3e79ef80bf16e5a7c666e4756f0e4cd4
Fix jinja2 "or" operator
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/8da534ecfcdb13fde2b2e9e61aa8f4c54ec174fc
Run integration pipeline for target branch only
When we're integrating a single branch into a single manifest branch,
there is no need to run the intgeration pipeline for all configured
integrations, but only for those that match the target branch of the
current merge request.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/8c94b725b330b1ba40357042861bd5ec38130cd4
ci-test: add job to check for correct foo branch
This should catch an error where during a gitlab-ci merge process the
wrong foo branch is integrated into the manifest, which happened in
Yocto.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/163c7e1e0cb0d73db504f9e64503d905b253902f
Add yml extension to jinja2 templates
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/59523aa0675472765aed61a56f44af4da5bb9107
check job: disable verbose output
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/28bf00653b2cc63a49a6e8189b148138c5446178
retrigger: add job states to log message
---
.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 fd742017..3eef782e 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit fd74201777c771cf911112ce8e196f29f9598dd8
+Subproject commit 3eef782efc50e805fd4640281aa8039d8594720e
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18002180..63e4e421 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,13 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: fd74201777c771cf911112ce8e196f29f9598dd8
+ ref: 3eef782efc50e805fd4640281aa8039d8594720e
file: 'manifest-pipeline-yocto.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH: kirkstone
- GITLAB_CI_REVISION: fd74201777c771cf911112ce8e196f29f9598dd8
+ GITLAB_CI_REVISION: 3eef782efc50e805fd4640281aa8039d8594720e
generate-build-jobs:
variables:
diff --git a/SRCREV.conf b/SRCREV.conf
index ab638717..a387ff07 100644
--- a/SRCREV.conf
+++ b/SRCREV.conf
@@ -1,15 +1,15 @@
-SRCREV:pn-egalaxi2c = "a2a410f5abd9b2cf0ee68c10dca6096a8199cd6d"
-SRCREV:pn-emc-test-suite = "5b57c20558a6295db4f5d068e3322116e1ac2c32"
-SRCREV:pn-gf-productiontests = "54a08f0b62ec6cb6cdb848187e3fb23711e3a46b"
-SRCREV:pn-gfeeprom = "98b14ba4497073e49a82aa0eae6e9576e9fd1622"
-SRCREV:pn-gfplatdetect = "0a8638698ff1e24761b37b7fd310afaf49167c0e"
-SRCREV:pn-gfxml2dto = "956b08e52e132302c8faf19be031154c65d9fee0"
-SRCREV:pn-seco-show-demo = "c051b6516e9bbb78bba21b479b7adb722bd840fc"
-SRCREV:pn-libmdb = "82c95bfbf2d9f39a328461d38e8f3a7a1fa8fcb4"
-SRCREV:pn-linux-guf = "9b40d7f7a76c8a76c975024de373674f7f817834"
-SRCREV:pn-linux-imx = "f93df25997b239415bfa4e1c91968430e839bc81"
+SRCREV:pn-egalaxi2c = "1187628b51e10fcb8c476f1675730546ff2e80bc"
+SRCREV:pn-emc-test-suite = "7f0434512cdf4e373894cf43ebae7cd3c320bccc"
+SRCREV:pn-gf-productiontests = "f9fdca86ea264b46949a19885a4ae04748a5807f"
+SRCREV:pn-gfeeprom = "f61fa2bd24a5678419f35e467020cd34bb1c467f"
+SRCREV:pn-gfplatdetect = "78c4ad382870e2c52e53167f106e2e77b4bbe0ac"
+SRCREV:pn-gfxml2dto = "e28ae167772acdc9443dd1301c743908a7d9ad3a"
+SRCREV:pn-seco-show-demo = "9e30b700f2765bf2b8ea35ddf81e7ef88147ffe9"
+SRCREV:pn-libmdb = "4182c1ae9ae2c8c338715d569380dce4e550b81a"
+SRCREV:pn-linux-guf = "12b4e6a58d3683582be81d0c61d1e959655253a4"
+SRCREV:pn-linux-imx = "867b40cc419df76093b69559719e383ee7509811"
SRCREV:pn-linux-imx-kuk = "0258f07c61364958e3307da11a388e72baffb03a"
-SRCREV:pn-touchcal-conv = "5418f254824bea0c7a1acbee37999520f589d538"
-SRCREV:pn-u-boot-imx = "a48671c4b479a148f3df242cba4e6319b673cb22"
-SRCREV:pn-xconfig = "5bd2ecdd71753b627f1d4b74b3f584e3e13e45c0"
-SRCREV:pn-qt-multi-screen-compositor = "78c77b8859f8863adc1d7f83d288437b3e0541b3"
+SRCREV:pn-touchcal-conv = "56009c595b282df83bd61e029f50b1fcf523a5cb"
+SRCREV:pn-u-boot-imx = "0a1571f5d527e518849f0888001c45ed88c4e4a3"
+SRCREV:pn-xconfig = "7bced64456919d6e6cda3258deb90d71daa3ebc8"
+SRCREV:pn-qt-multi-screen-compositor = "eea340976cf69891d99bc64ece7a0b9c4b27bdfd"
diff --git a/default.xml b/default.xml
index 2731dda7..9198baab 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="8d8f2c5839acb100b6f93072cf259e7f0790ce08" remote="seco-ne" path="sources/meta-seconorth-machine" />
- <project name="layers/meta-seconorth-distro" revision="30f0b9df79c58103d4a87106527efedd3a45780b" remote="seco-ne" path="sources/meta-seconorth-distro" />
- <project name="layers/meta-seconorth-nogplv3" revision="9b5d9d582e7d238e7392ae1511a2bb3414052310" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
- <project name="config" revision="8199ac581fa98787f918ab1d204bca4cb8ae62e1" remote="seco-ne" path=".conf" >
+ <project name="layers/meta-seconorth-machine" revision="038a2f4cb9d84cfd9ca1456de6b569edb3d75176" remote="seco-ne" path="sources/meta-seconorth-machine" />
+ <project name="layers/meta-seconorth-distro" revision="949f0a2dce7e4379d19a4d7b40ede4fbda498624" remote="seco-ne" path="sources/meta-seconorth-distro" />
+ <project name="layers/meta-seconorth-nogplv3" revision="9536dd9cd4ee3b978c9573a8a8d32c826e765d1f" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
+ <project name="config" revision="4f161b2477f26454a8d9ff7a174e474fee2ea2ba" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
</project>
--
GitLab