From b94c0db8a5728064a3b0fc1232320e0531256f92 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@seco.com>
Date: Mon, 18 Sep 2023 07:03:29 +0000
Subject: [PATCH] Integrate gitlab-ci/hide-stages-if-variables-not-set and 4
more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/64dc51d3244909d5ce3dd1a99580d60fce0f0a64
Use regex operator to check for multiple variables
The "&&" operator does not work as expected when checking if multiple
variables are set.
See for reference:
https://gitlab.com/gitlab-org/gitlab/-/issues/321371
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/89fbce242cdf1b3d2e17146af639abc18438037c
Hide Confluence stage if confluence variables not set
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/db50e93bf77012701c287e6c0a98f5ae9ab3be5f
Hide deploy stage if DEPLOY_RELEASE_TARGET not set
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/f4aa0048f11967abce493810aefb429a13ded32f
Hide FTP stage if DEPLOY_FTP_TARGET not set
This makes the variable HIDE_FTP_UPLOAD_STAGE obsolete, because we can
hide the FTP stage now by setting DEPLOY_FTP_TARGET to an empty string.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/409c4f27b64736a690c9a9dd6fdd7e197e48d6ad
Do not run CI test sub-pipeline on master
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
SRCREV.conf | 24 ++++++++++++------------
default.xml | 8 ++++----
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index a731b156..64dc51d3 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit a731b1569292fc3742fa16fc2328524ea2a93f9f
+Subproject commit 64dc51d3244909d5ce3dd1a99580d60fce0f0a64
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ec3f785..5159dc7e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,13 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: a731b1569292fc3742fa16fc2328524ea2a93f9f
+ ref: 64dc51d3244909d5ce3dd1a99580d60fce0f0a64
file: 'manifest-pipeline-yocto.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH: dunfell
- GITLAB_CI_REVISION: a731b1569292fc3742fa16fc2328524ea2a93f9f
+ GITLAB_CI_REVISION: 64dc51d3244909d5ce3dd1a99580d60fce0f0a64
generate-build-pipeline:
variables:
diff --git a/SRCREV.conf b/SRCREV.conf
index 58af086a..a618c53b 100644
--- a/SRCREV.conf
+++ b/SRCREV.conf
@@ -1,14 +1,14 @@
-SRCREV_pn-gf-productiontests = "2caf1c9b1715fb2b02fe754ccbb82d657ac7072b"
-SRCREV_pn-gfeeprom = "06a91c07a8c1c17adfbbff77b9dc9469434b1b13"
+SRCREV_pn-gf-productiontests = "7f7f6dc9cd9f80aea008c89f1aa15b17b23e7838"
+SRCREV_pn-gfeeprom = "84f6d330bd190d4b0479651e52b3be3ce94ecdae"
SRCREV_pn-guf-show-demo = "dd131b8daf8023dea33165ab60c58d8f2e8f1f20"
-SRCREV_pn-libmdb = "e191d13d8877602852ea3d2d0b483db344b46fe8"
-SRCREV_pn-ltp-guf-tests = "69b350200239939d485d85030d055c3fcc67533d"
-SRCREV_pn-touchcal-conv = "c2e06bcb57f8aa3c2c44153eb4f99daa636648b7"
-SRCREV_pn-gfxml2dto = "963710eb446def50f83ccf4e3e922025ce07c337"
-SRCREV_pn-egalaxi2c = "4f4ceee69eb5874d63898d4e99865ec96b629577"
-SRCREV_pn-gfplatdetect = "9d0eccba7cb2dfed30f332cf27f7672aecf46e4b"
-SRCREV_pn-xconfig = "1a9f8d423d257bb3d6f707557e094065c3038a8b"
-SRCREV_pn-linux-guf = "18dd36c8cff7242e4fe3ad1be5a2a5066f5b9f3c"
-SRCREV_pn-linux-imx-kuk = "47868977d756b31c5ecb2674cc4a23d4406b3e1c"
+SRCREV_pn-libmdb = "df6dc596f444613240e3d58fa770cee8d09d5dcd"
+SRCREV_pn-ltp-guf-tests = "c6e87e334f340be76b17a0d42fa36c156cd72c18"
+SRCREV_pn-touchcal-conv = "d9fbc501d80f06230490c9b6866db4038721e4f7"
+SRCREV_pn-gfxml2dto = "cc0e343dced4f3c3c7619245b5671c38ab2e53b6"
+SRCREV_pn-egalaxi2c = "7f5004883686f95a19d2bd2f85248d88bf00dfc8"
+SRCREV_pn-gfplatdetect = "76c54b7f4832b88cb908fd6c7bc89f94e007afe9"
+SRCREV_pn-xconfig = "cbb354bb716bd31e0e0913ad5d936905923a1f28"
+SRCREV_pn-linux-guf = "088efc4bb53c6f16c41ca687f71033a484ef004a"
+SRCREV_pn-linux-imx-kuk = "cbf4cbe0647a1547bb2614528da71bf3de3377d2"
SRCREV_pn-u-boot-imx = "a89b445ae46842ee508773052110807528403a47"
-SRCREV_pn-qt-multi-screen-compositor = "6b54f65763c55774973a8d1d0c15330d434c6b3b"
+SRCREV_pn-qt-multi-screen-compositor = "8a3fc0fffaacccccc2b651a9becfe5037b67adbc"
diff --git a/default.xml b/default.xml
index ecb76425..5f3bce58 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="e00f629b119bc5c47eea6c8e9ee4769e6b302240" remote="seco-ne" path="sources/meta-seconorth-machine" />
- <project name="layers/meta-seconorth-distro" revision="5f5a08e0c4cc583496bad62baec98df46cea1eb6" remote="seco-ne" path="sources/meta-seconorth-distro" />
- <project name="layers/meta-seconorth-nogplv3" revision="8f7e6039490361aaedf2b5bbf97d777d2ce36b4a" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
- <project name="config" revision="450ab934ff634ae8eb51bc05edd7554b4b076e27" remote="seco-ne" path=".conf" >
+ <project name="layers/meta-seconorth-machine" revision="7f1b97fde2fe2ddfd1869aba29b640bc2ee14422" remote="seco-ne" path="sources/meta-seconorth-machine" />
+ <project name="layers/meta-seconorth-distro" revision="e6a621edcefdc04f8d7891f6dd19cdc34738f28a" remote="seco-ne" path="sources/meta-seconorth-distro" />
+ <project name="layers/meta-seconorth-nogplv3" revision="924449174d3f5b5a5a5fb94539af802aa8b4d436" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
+ <project name="config" revision="6d7f815266810df80ecfe5a88abb23da39004139" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
</project>
--
GitLab