From 6d6309c20ef1d45af09637e6274328ef83e0535e Mon Sep 17 00:00:00 2001
From: gitbot <gitbot.north@seco.com>
Date: Wed, 8 May 2024 08:51:07 +0000
Subject: [PATCH] Integrate gitlab-ci/ci-fixes and 5 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/54f17a6909d389e7eb84facd9772bd033b491d84
Update CI_IMAGES_REVISION
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/4fd7f8a8bf078eb95b6f1f87864de8a50a6524fe
report_image_diff: get rid of hardcode
Parse machines, pipeline names and distros from gitlab yaml file instead of
harcoding these values in the script.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/05d6a8db19b1bf54303900a80e4d820fc789d7f6
fullbuildpipeline.py: fix timeout
The problem was found in pipeline:
https://git.seco.com/seco-ne/yocto/manifest/-/jobs/954246
Fix missing update of upstream pipeline status inside while loop.
The timeout in the script was not in sync with the default timeout for build jobs.
Set timeout in __get_build_pipelines() function to 8 hours.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/3077d25208931e858e7413dd891a3b59e62b959f
handle_artifacts: add "try" block for keep_/delete_artifacts
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/b0be529b38d5dc421efab1c860351a4cf825baa3
handle_artifacts: fix case when pipeline was canceled
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/1a4a5ab1b40352cf59ba84a8efb2289b7338edd5
Refactoring: move common code to separate files
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
SRCREV.conf | 48 ++++++++++++++++++++++++------------------------
default.xml | 10 +++++-----
4 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index bf6de920..54f17a69 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit bf6de920933953551887f5c12af505a1def8fb44
+Subproject commit 54f17a6909d389e7eb84facd9772bd033b491d84
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dc7d93a2..7a3ec954 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,13 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: bf6de920933953551887f5c12af505a1def8fb44
+ ref: 54f17a6909d389e7eb84facd9772bd033b491d84
file: 'manifest-pipeline-yocto.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH: kirkstone
- GITLAB_CI_REVISION: bf6de920933953551887f5c12af505a1def8fb44
+ GITLAB_CI_REVISION: 54f17a6909d389e7eb84facd9772bd033b491d84
generate-build-pipeline:
variables:
diff --git a/SRCREV.conf b/SRCREV.conf
index aa1a8fe0..2cdfc529 100644
--- a/SRCREV.conf
+++ b/SRCREV.conf
@@ -1,25 +1,25 @@
-SRCREV:pn-atmel-mxt = "0009306941e6aec6c4b87b62f6b3346a2a2a2a3b"
-SRCREV:pn-egalaxi2c = "1517900e01194dd3f5f86802daca2e23b5ff7684"
-SRCREV:pn-emc-test-suite = "65238866b87b0773d5dfac46daf40d33573fac36"
-SRCREV:pn-gf-productiontests = "e34fc1ae75ab4cb9681db7279ae46bd1ed0d3701"
-SRCREV:pn-gfeeprom = "029dc8a08b2e0c5b02501cbce2abf3129543b978"
-SRCREV:pn-gfplatdetect = "fe9451ebb9f7ba48f4d350e9950882f56b4b5136"
-SRCREV:pn-gfxml2dto = "1cddc5024d6b7e75f9376e21afc86561e21c1ef9"
-SRCREV:pn-ilitek = "8e0635e45f8c63354116c97f681a42d9ab46436f"
-SRCREV:pn-kernel-module-touchgpio = "60b0c5939ecbe58006936e715517ed93747cc3dd"
-SRCREV:pn-libmdb = "4032239645a5e706f86e48a5fadedb6eacaa14e8"
-SRCREV:pn-linux-imx = "07d9d00142388c35cff70e777cf1a28c5d3bb8c2"
+SRCREV:pn-atmel-mxt = "a40f847c0ac3a56680e16af1a2e9c700eab9c2ff"
+SRCREV:pn-egalaxi2c = "2386952148c5d451d80107030507a41f3415a4c7"
+SRCREV:pn-emc-test-suite = "56fc6ff7aac4481b91028ee890d653c3a11b2369"
+SRCREV:pn-gf-productiontests = "ed23b21e80d3ca6082cfa252d1ff0559b0cc80f5"
+SRCREV:pn-gfeeprom = "e8f734d1e69a986e7e3002356f626813992fa75c"
+SRCREV:pn-gfplatdetect = "829407b876ace7785a12e671ce43bf4fe5a40cc3"
+SRCREV:pn-gfxml2dto = "0c1f44187efb4fb80df38e5c3c872c44d776d202"
+SRCREV:pn-ilitek = "4cee981fd44083fe6baa1a8572e1708734f36a46"
+SRCREV:pn-kernel-module-touchgpio = "3814f058d7ace575ebe3ae3fa4d33d03fb79dc82"
+SRCREV:pn-libmdb = "3816187d00067a50578c5f7eb654d9cb4466e90b"
+SRCREV:pn-linux-imx = "9bcf94180f5fdba59de6e7bcfad1fcb1b47fc839"
SRCREV:pn-linux-imx-kuk = "0258f07c61364958e3307da11a388e72baffb03a"
-SRCREV:pn-linux-seconorth = "6c3b1d3514fdf63b41b7c47cf275880a4909fef4"
-SRCREV:pn-linux-seco-mtk = "91ad88b4ea5be511822784aff34437fb3525c3b0"
-SRCREV:pn-qt-multi-screen-compositor = "975227504e8fcae32b79b331a5e23a5552d66bf1"
-SRCREV:pn-seco-sharedconf = "d5fedfa4213264a222161a7befde85a42ee19026"
-SRCREV:pn-seco-show-demo = "c82ce63ab1d714993d45299a4a2746e033f1b612"
-SRCREV:pn-seco-yocto-testsuite = "d6934c5f505e334bafb2872f942ccce17be80489"
-SRCREV:pn-secure-element-examples = "587154432c8c5b076b0efde207d9b96ac0828d5d"
-SRCREV:pn-touchcal-conv = "6931e6cd3a407742ad15a20a922b19195374d077"
-SRCREV:pn-u-boot-seco-imx = "afd163b0a15d949537515fe53943ffea76cca238"
-SRCREV:pn-u-boot-seco-mtk = "d02749ea2fc27c54174dcf09fc2ba32a55e2655c"
-SRCREV:pn-xconfig = "83a7642f40aa6e2f0765828b20c4223f13948b5f"
-SRCREV:pn-yocto-install = "c7ba1b91a86831cad7ed8304466979a1a1a51cc5"
-SRCREV:pn-seco-stm32 = "55dfb030205712e1d07d30134f3d3ee49dd3f485"
+SRCREV:pn-linux-seconorth = "4458c8983b195885ede7d16bff585c3f96214dc2"
+SRCREV:pn-linux-seco-mtk = "c1e29ebd471d81167c86d2f920791e6e7711e560"
+SRCREV:pn-qt-multi-screen-compositor = "d21c14878651b0ad2021e46f8d962d30e621cff5"
+SRCREV:pn-seco-sharedconf = "7c557fc83f2706a9ce98786d76e5b0ca7dc89ff5"
+SRCREV:pn-seco-show-demo = "2d4199557c3f152030fd7b44ca6a85d4a0a7c88d"
+SRCREV:pn-seco-yocto-testsuite = "6637e8a46dda2ca6e943e3c98ae4e5473d42c41c"
+SRCREV:pn-secure-element-examples = "1da3d6707e093b6db0a0f277405a02e889567b83"
+SRCREV:pn-touchcal-conv = "7423af9991e8f1436afbe25bef5a9042057103f9"
+SRCREV:pn-u-boot-seco-imx = "69196a4938f841230d3cc25f131a90fdd86ff0d5"
+SRCREV:pn-u-boot-seco-mtk = "0d0fb6b8ee20ed5b6607306581e64cc03f007d92"
+SRCREV:pn-xconfig = "4c99ca014802d8896cc656200386143248f891e1"
+SRCREV:pn-yocto-install = "f102e5b1893bdeab0292776b98e28ea43689776f"
+SRCREV:pn-seco-stm32 = "24872b2c155eb80fe1e9889b9e6ae111963cca8d"
diff --git a/default.xml b/default.xml
index 0bf1084f..ef1d0ac8 100644
--- a/default.xml
+++ b/default.xml
@@ -28,11 +28,11 @@
<project name="meta-mediatek-bsp.git" revision="048e2981c96b0e93896d540c53b789f8c93c7e6e" remote="rity" path="sources/meta-mediatek-bsp" />
<project name="meta-rity.git" revision="bc2393cf3c26a3db6da719a5e05d517c6fe01e6c" remote="rity" path="sources/meta-rity" />
<project name="meta-rauc.git" revision="804386f04826ea7fe74a1b4e0a20991425c06d9c" remote="rauc" path="sources/meta-rauc" />
- <project name="layers/meta-seconorth-machine" revision="4e7c28a8e54e436ce68fc1f4e6a649308bed28cd" remote="seco-ne" path="sources/meta-seconorth-machine" />
- <project name="layers/meta-seconorth-mtk" revision="7171ca3ec1df62e24fab749157012812bd40e7b6" remote="seco-ne" path="sources/meta-seconorth-mtk" />
- <project name="layers/meta-seconorth-distro" revision="2aa3116c57c9ff47b4da40d4740f6624029c0872" remote="seco-ne" path="sources/meta-seconorth-distro" />
- <project name="layers/meta-seconorth-nogplv3" revision="6364f29dacd324b098c9e65cb16db6d6995e2024" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
- <project name="config" revision="d03140b8bcc95ef2ee7e3ff4df46a25a14ec4542" remote="seco-ne" path=".conf" >
+ <project name="layers/meta-seconorth-machine" revision="c9b35358aa6059573ac56258ee55385e7ff1075d" remote="seco-ne" path="sources/meta-seconorth-machine" />
+ <project name="layers/meta-seconorth-mtk" revision="5232784b574cc0cf35709ade97700b1ef99dcb95" remote="seco-ne" path="sources/meta-seconorth-mtk" />
+ <project name="layers/meta-seconorth-distro" revision="8072073dd8454024c58562cc856de16e4118856f" remote="seco-ne" path="sources/meta-seconorth-distro" />
+ <project name="layers/meta-seconorth-nogplv3" revision="e8c1d80be977fae53a2e471c5c5bf5c710b296dc" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
+ <project name="config" revision="bce24f4ca1eea49edba85232a3a69ffa01ef43c8" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
</project>
--
GitLab