From f2238449879acaf21eb59e36824adfa6ae57694c Mon Sep 17 00:00:00 2001
From: gitbot <gitbot.north@seco.com>
Date: Wed, 20 Mar 2024 13:02:55 +0000
Subject: [PATCH] Integrate gitlab-ci/fix-confluence-missing-mx6-section and 1
more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/ab19eb61134380b86d35ab0c5ec92a3033a272e4
CI: collect_release_information: jump to next pipeline if no deploy jobs found
See for error:
https://git.seco.com/seco-ne/yocto/infrastructure/ci-test/minimal-manifest/-/jobs/828261
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/ae764fbc3e56488b362fbb3ed37ed8465287db80
CI: Confluence page: Fix not created mx6 section
The function that merges the variables of the different jobs, i.e:
`MACHINE="mx6"`
`MACHINE="mx6ull"`
used python `in` to check if a value already exists.
But `"mx6" in "mx6ull"` is true, so mx6 was dropped.
This rewrites it, storing the variables in a set (which is unique
automatically) instead of space seperated strings.
Space seperation is added before printing the variables to be used on
on the shell.
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
SRCREV.conf | 20 ++++++++++----------
default.xml | 8 ++++----
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index 094983ae..ab19eb61 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit 094983aec67b5e58813cf89d731d052c48804bac
+Subproject commit ab19eb61134380b86d35ab0c5ec92a3033a272e4
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0dec7a4d..fea9dc25 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,13 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: 094983aec67b5e58813cf89d731d052c48804bac
+ ref: ab19eb61134380b86d35ab0c5ec92a3033a272e4
file: 'manifest-pipeline-yocto.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH: dunfell
- GITLAB_CI_REVISION: 094983aec67b5e58813cf89d731d052c48804bac
+ GITLAB_CI_REVISION: ab19eb61134380b86d35ab0c5ec92a3033a272e4
generate-build-pipeline:
variables:
diff --git a/SRCREV.conf b/SRCREV.conf
index 21908828..ef47ebb4 100644
--- a/SRCREV.conf
+++ b/SRCREV.conf
@@ -1,14 +1,14 @@
-SRCREV_pn-gf-productiontests = "0134a0e5c1bd19ef93fa87dd9672299a016ade43"
-SRCREV_pn-gfeeprom = "66843637c759ebafff6fdd5e14dc680f0ef16481"
+SRCREV_pn-gf-productiontests = "4a3f7c626059a31b57da38e0ada6c5d3213916be"
+SRCREV_pn-gfeeprom = "93855db8e3ce383ad4d105091cbaa9b837e5f5af"
SRCREV_pn-guf-show-demo = "dd131b8daf8023dea33165ab60c58d8f2e8f1f20"
-SRCREV_pn-libmdb = "86529342708a9d6d5b381d6e56819e9921f0b913"
-SRCREV_pn-ltp-guf-tests = "072d7ce81b877265c10159091916a409b68a90d1"
-SRCREV_pn-touchcal-conv = "367db180e92248b7bb2272b4c4b1f7878688e092"
+SRCREV_pn-libmdb = "f5c11b9cd987801acee2a94e6234293f1f0a6001"
+SRCREV_pn-ltp-guf-tests = "94382562101ba2c102994e5e93c36b01de6ff8ad"
+SRCREV_pn-touchcal-conv = "2ffe2deaa9213979820b935a6de921fcee3aa33c"
SRCREV_pn-gfxml2dto = "66160ee5b1c65111f2e011034b18baf83251090b"
SRCREV_pn-egalaxi2c = "0b203dde93a67edc4a42a843a2528edf59af0c22"
-SRCREV_pn-gfplatdetect = "8329103fdb31ec3edbc5da8b79f7dc3d26268ebc"
-SRCREV_pn-xconfig = "49c894bd6abe2a5f916e742e19e68c0b28029242"
-SRCREV_pn-linux-guf = "85693ef7a621447548cff7f5e08666f5da2306be"
-SRCREV_pn-linux-imx-kuk = "e7ad54bc9255050153252710f4ea0b9a3de9f88b"
+SRCREV_pn-gfplatdetect = "8bba82dde2198e000bd28766ba37cd610463cedd"
+SRCREV_pn-xconfig = "ec20c575ad19941cf1d90d0cc0dbda2ca27db7fc"
+SRCREV_pn-linux-guf = "0681fcbd68b570fd177c133e844ac0d344d04862"
+SRCREV_pn-linux-imx-kuk = "1b0a80e4cada16b16033f39093c583960cb6d176"
SRCREV_pn-u-boot-imx = "a89b445ae46842ee508773052110807528403a47"
-SRCREV_pn-qt-multi-screen-compositor = "9d763abb21491bb9336ffca974780e117f6f0bb2"
+SRCREV_pn-qt-multi-screen-compositor = "57465544024bc3fb0933f19ebd82b447aef6c8b9"
diff --git a/default.xml b/default.xml
index 05d91f88..2d17e4ae 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="cc6128defdbfcb0edea0b1780910f445f7670c82" remote="seco-ne" path="sources/meta-seconorth-machine" />
- <project name="layers/meta-seconorth-distro" revision="00f424e9595ec76bcf5c5afdc0d1b5496da2cc01" remote="seco-ne" path="sources/meta-seconorth-distro" />
- <project name="layers/meta-seconorth-nogplv3" revision="7159f49831096ddd46897aa40701f9d58c70cda1" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
- <project name="config" revision="6238e56ab3f34c3817adbdf566405c5afa92a845" remote="seco-ne" path=".conf" >
+ <project name="layers/meta-seconorth-machine" revision="500fba1ae548b92caf133db5df2a07cfb4e829b2" remote="seco-ne" path="sources/meta-seconorth-machine" />
+ <project name="layers/meta-seconorth-distro" revision="a7cea1b85246e0be33c2a04b3caa118bec8a7005" remote="seco-ne" path="sources/meta-seconorth-distro" />
+ <project name="layers/meta-seconorth-nogplv3" revision="6358677b707d3017db91dff0fea6cfe786dd5dbe" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
+ <project name="config" revision="61af1cbbdc4644c5140f5767c5c8c48b8a85be2f" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
</project>
--
GitLab