From ccc2e272a1afff208d38d72b29f9b42f838a9f9a Mon Sep 17 00:00:00 2001
From: gitbot <gitbot.north@seco.com>
Date: Thu, 23 May 2024 12:01:19 +0000
Subject: [PATCH] Integrate gitlab-ci/report-image-diff-rework and 1 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/bd4caeae042c7e51f2982e06e3f2531292656a7e
report_image_diff: rework variables extraction
The current solution makes too much assumptions about the pipeline and needs
to reimplement some of the gitlab yaml interpretion.
The new version of the script extracts MACHINE and DISTRO from the jobs themselves:
- MACHINE is part of the build job name ("build-$MACHINE");
- DISTRO is printed by bitbake and can be found in build log.
Typos
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/cbf168ebd86b09d06b8d7d7e559e5bcedd0607dd
build:credentials: Fix error when storing credentials in cache
The credentials helper wasn't storing the credentials in the cache.
Seemingly, the echo added whitespaces at the beginning of the lines
which can't be interpreted by the git credential approve command.
Also the USERNAME was renamed to TOKEN_USER because the variable is
already filled with the system users name.
---
.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 d09e3a96..bd4caeae 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit d09e3a9655559495e9aeff194e3ea44a2acdb315
+Subproject commit bd4caeae042c7e51f2982e06e3f2531292656a7e
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5b266d4..b3242bbf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,13 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: d09e3a9655559495e9aeff194e3ea44a2acdb315
+ ref: bd4caeae042c7e51f2982e06e3f2531292656a7e
file: 'manifest-pipeline-yocto.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH: kirkstone
- GITLAB_CI_REVISION: d09e3a9655559495e9aeff194e3ea44a2acdb315
+ GITLAB_CI_REVISION: bd4caeae042c7e51f2982e06e3f2531292656a7e
generate-build-pipeline:
variables:
diff --git a/SRCREV.conf b/SRCREV.conf
index 1ff8dac9..1f121d6e 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 = "8d7a28161b72481055f54abc9a433ae346cf22d5"
+SRCREV:pn-egalaxi2c = "6c3cf318f09d17082c05659ff8df07e64bfda6c2"
+SRCREV:pn-emc-test-suite = "b0321fcaa6ba2567faa224dc93ba553c3462272f"
+SRCREV:pn-gf-productiontests = "02bf9429dccb3c4ace966406a415d5e52c5f6987"
+SRCREV:pn-gfeeprom = "83acff2e0d6f9140713d565a86b02879af91bae3"
+SRCREV:pn-gfplatdetect = "13110cb4939dd895f24591f9e93faf0e561aa22c"
+SRCREV:pn-gfxml2dto = "083348cd70010b3314f40bd4a096dc1c2a7b6e4b"
+SRCREV:pn-ilitek = "2c0ba36abcc97af41026a0cafc63bd784b4d2a43"
+SRCREV:pn-kernel-module-touchgpio = "22b0c67a3f5e564034f2ac005a9334414d7ea2c9"
+SRCREV:pn-libmdb = "1939cbb401481a828901e1c6d34d92d02a6bed8d"
+SRCREV:pn-linux-imx = "2a5777dec0d8c843eb3bd2fb39558639ed9f2edc"
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 = "3c242c0146d03c9fd1c066eca322e0954d265ff8"
-SRCREV:pn-seco-show-demo = "6f9562b73e7611a5172f740a043580c9ee7c7340"
-SRCREV:pn-seco-yocto-testsuite = "d6934c5f505e334bafb2872f942ccce17be80489"
-SRCREV:pn-secure-element-examples = "587154432c8c5b076b0efde207d9b96ac0828d5d"
-SRCREV:pn-touchcal-conv = "6931e6cd3a407742ad15a20a922b19195374d077"
-SRCREV:pn-u-boot-seco-imx = "7c7db4114b0952215df596d203032e8037eb2333"
-SRCREV:pn-u-boot-seco-mtk = "5adf2ac21593585ba9df91abffc41f4a686c2c00"
-SRCREV:pn-xconfig = "83a7642f40aa6e2f0765828b20c4223f13948b5f"
-SRCREV:pn-yocto-install = "cbf10a90156fb7f6e7294cda12f4f219f011e656"
-SRCREV:pn-seco-stm32 = "55dfb030205712e1d07d30134f3d3ee49dd3f485"
+SRCREV:pn-linux-seconorth = "407e9e5a84c0ab0426ef17d6daf60825c0c8eff2"
+SRCREV:pn-linux-seco-mtk = "e21557d65f81d86dcfd5349778f66ff7f16e7aa9"
+SRCREV:pn-qt-multi-screen-compositor = "4fef7be675dd4e2dd4fceb7e6807dc16ad39b7b2"
+SRCREV:pn-seco-sharedconf = "524e8a75d67238c1188a00b12560d3519eb5ea0d"
+SRCREV:pn-seco-show-demo = "aaaedf89b665b9234a9d9c9ba02c7668a897b99a"
+SRCREV:pn-seco-yocto-testsuite = "d1044ef6599d11b0dc244bcdb6514442e1c4c19d"
+SRCREV:pn-secure-element-examples = "9e9ef3fdef77cd0f05dd8f38048f77ca28349a9a"
+SRCREV:pn-touchcal-conv = "1bd48ee061e77db9b399b3ec5bfa8a82136ebbbf"
+SRCREV:pn-u-boot-seco-imx = "0f8bf2f7650a895c397ef3a8b501381105eb182c"
+SRCREV:pn-u-boot-seco-mtk = "68aafe562a6ed249e4bf3625c8840e23c1a07b00"
+SRCREV:pn-xconfig = "c64b8c70cd15795803410376edba4196aa333e86"
+SRCREV:pn-yocto-install = "cfaccb34d7909dda250969ad7a412bbe14b35984"
+SRCREV:pn-seco-stm32 = "a8965e7b113ad55ab666b017dd6ebf69bc697c5c"
diff --git a/default.xml b/default.xml
index 767e5203..a18974f9 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="80eea0a33b732598ba60080aff9abda425a73baa" remote="seco-ne" path="sources/meta-seconorth-machine" />
- <project name="layers/meta-seconorth-mtk" revision="754eab2072bb047b3f9912d4a183c0ef4027926a" remote="seco-ne" path="sources/meta-seconorth-mtk" />
- <project name="layers/meta-seconorth-distro" revision="4870f68ce207b876349e73f31abee443ceece6bf" 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="96799c567e17b884a90dd976ce09fb7a673a7054" remote="seco-ne" path=".conf" >
+ <project name="layers/meta-seconorth-machine" revision="ef07578b02ae7ceca86a5477d04af5b0e889ced1" remote="seco-ne" path="sources/meta-seconorth-machine" />
+ <project name="layers/meta-seconorth-mtk" revision="47d6e4ef8fa33e2d1d9c9e7628c89ecd3d243c2c" remote="seco-ne" path="sources/meta-seconorth-mtk" />
+ <project name="layers/meta-seconorth-distro" revision="4c981cc1058c938bc5115a2b38d0aba27b96f024" remote="seco-ne" path="sources/meta-seconorth-distro" />
+ <project name="layers/meta-seconorth-nogplv3" revision="6149d547ea50cda290e7be389a4cbbbbe33d293f" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
+ <project name="config" revision="280776a098d57c2156a990737bf9151a04716ecf" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
</project>
--
GitLab