From 336b0f35a48aea011c08daa24c23a853188d6a51 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot.north@seco.com>
Date: Thu, 16 May 2024 18:39:52 +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/212a3af923042ec24a52c738ac5ca1b0348a3de4
Move report_image-diff to downstream pipeline
--
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..212a3af9 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit d09e3a9655559495e9aeff194e3ea44a2acdb315
+Subproject commit 212a3af923042ec24a52c738ac5ca1b0348a3de4
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5b266d4..1e255a03 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: 212a3af923042ec24a52c738ac5ca1b0348a3de4
file: 'manifest-pipeline-yocto.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH: kirkstone
- GITLAB_CI_REVISION: d09e3a9655559495e9aeff194e3ea44a2acdb315
+ GITLAB_CI_REVISION: 212a3af923042ec24a52c738ac5ca1b0348a3de4
generate-build-pipeline:
variables:
diff --git a/SRCREV.conf b/SRCREV.conf
index 1ff8dac9..9b1752df 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 = "c8b4915f59accced959a8978e597b6569bcbc3eb"
+SRCREV:pn-egalaxi2c = "5b26199b0092676bf78856a713de96badf3504cc"
+SRCREV:pn-emc-test-suite = "3d1975b09adff2907546832d65370af97c623aec"
+SRCREV:pn-gf-productiontests = "927c04357f39f3d2d13f65aaeee72e6f1233b132"
+SRCREV:pn-gfeeprom = "21bf6fda8460c70df1c29bed0a1e47da84f77a7d"
+SRCREV:pn-gfplatdetect = "aa1f3c6f14cb0d6c5faa749639c71ca39b832b94"
+SRCREV:pn-gfxml2dto = "510de1b3a420b4b04bda0dafd76892097ee36180"
+SRCREV:pn-ilitek = "682ef582c9f59489563a5b169d0491bcea91a7c1"
+SRCREV:pn-kernel-module-touchgpio = "ee9ebeca0d3674eadec75f1d7c99a52fefb96d5c"
+SRCREV:pn-libmdb = "ff4cc8c12593f774c1556d0c3c7e8c143fddbc5c"
+SRCREV:pn-linux-imx = "964c472db0578595c9e8a263fd88f73d88d8b7ac"
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 = "5c111b3fd44e8775fd77be3e3c7912eea0ee69a4"
+SRCREV:pn-linux-seco-mtk = "4a1dd1a6c56d9fbc36bd7039d9f15cfb4bec4e02"
+SRCREV:pn-qt-multi-screen-compositor = "667fb46266ebf3c59a6336a7019ae8da76bd875b"
+SRCREV:pn-seco-sharedconf = "4d6e847a8c539a3371b404a723f4b4031e200695"
+SRCREV:pn-seco-show-demo = "0b6b6fb31dded1c646b4247e84d55b3063df91da"
+SRCREV:pn-seco-yocto-testsuite = "89e555dbe1a23551963fbb0a9fab6c843ef2039b"
+SRCREV:pn-secure-element-examples = "948b3f0d045d84547242eb1533e7e3dc8de71264"
+SRCREV:pn-touchcal-conv = "a20e51e26e23bb2507615f9dc16277469a532bf7"
+SRCREV:pn-u-boot-seco-imx = "12823acfe0b6b374c809b1a5dd5e7461afa8e708"
+SRCREV:pn-u-boot-seco-mtk = "d785b8412566aaefa16edfe2afc8c793456cc130"
+SRCREV:pn-xconfig = "290cd936369f1e7f206606e0193f4ef2234ac903"
+SRCREV:pn-yocto-install = "f59a6e41121bb0581407fc008a6ca6218a0eabe1"
+SRCREV:pn-seco-stm32 = "cbfa90b90116e9be9611d5b79e8afa293808942a"
diff --git a/default.xml b/default.xml
index a734269d..71395cc0 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="9bb6bb736c0ab9e7fb6b279e7658ad0519ff9d65" 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="c10d6c3e66e5c7f9a62eed0becf1d7c2726c6caa" remote="seco-ne" path="sources/meta-seconorth-machine" />
+ <project name="layers/meta-seconorth-mtk" revision="1153076ef4ccba0aa94416bfa07d1d66ffabdb8f" remote="seco-ne" path="sources/meta-seconorth-mtk" />
+ <project name="layers/meta-seconorth-distro" revision="55ba76cfb58acfebb916d43aa6e1f82a2264f76b" remote="seco-ne" path="sources/meta-seconorth-distro" />
+ <project name="layers/meta-seconorth-nogplv3" revision="e540bb88495ba56bc228a213e09cfe438a94c3e8" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
+ <project name="config" revision="f368e6d81c844824ef7bc457311cce0510cf724a" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
</project>
--
GitLab