From 9671ff46748ded5c4cf930ed27518b81f7b99e1b Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@seco.com>
Date: Mon, 18 Sep 2023 07:03:38 +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 | 42 +++++++++++++++++++++---------------------
default.xml | 8 ++++----
4 files changed, 28 insertions(+), 28 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 31b396c0..0c2b7cf7 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: kirkstone
- GITLAB_CI_REVISION: a731b1569292fc3742fa16fc2328524ea2a93f9f
+ GITLAB_CI_REVISION: 64dc51d3244909d5ce3dd1a99580d60fce0f0a64
generate-build-pipeline:
variables:
diff --git a/SRCREV.conf b/SRCREV.conf
index 23f26d0b..0b9865ca 100644
--- a/SRCREV.conf
+++ b/SRCREV.conf
@@ -1,22 +1,22 @@
-SRCREV:pn-atmel-mxt = "30359791e0d8ac87ee394ed973169d17c0635675"
-SRCREV:pn-egalaxi2c = "4f4ceee69eb5874d63898d4e99865ec96b629577"
-SRCREV:pn-emc-test-suite = "42246e9d31af5c0fa2392d6a017afbb3957fe75f"
-SRCREV:pn-gf-productiontests = "2caf1c9b1715fb2b02fe754ccbb82d657ac7072b"
-SRCREV:pn-gfeeprom = "06a91c07a8c1c17adfbbff77b9dc9469434b1b13"
-SRCREV:pn-gfplatdetect = "9d0eccba7cb2dfed30f332cf27f7672aecf46e4b"
-SRCREV:pn-gfxml2dto = "963710eb446def50f83ccf4e3e922025ce07c337"
-SRCREV:pn-ilitek = "1975f97befaa84afb881bfbdb4f7994795c041e2"
-SRCREV:pn-kernel-module-touchgpio = "8b202683bec73ddbcc339e72321acd0395c088e9"
-SRCREV:pn-libmdb = "e191d13d8877602852ea3d2d0b483db344b46fe8"
-SRCREV:pn-linux-imx = "bbf1077789067bb1ee77ace0437d5bed4172ce69"
+SRCREV:pn-atmel-mxt = "c41a4230639943b9c102de435ae9315dd8abd3b2"
+SRCREV:pn-egalaxi2c = "7f5004883686f95a19d2bd2f85248d88bf00dfc8"
+SRCREV:pn-emc-test-suite = "cf85fac14175b8efe7781b207cfb9b456ac8cbbc"
+SRCREV:pn-gf-productiontests = "7f7f6dc9cd9f80aea008c89f1aa15b17b23e7838"
+SRCREV:pn-gfeeprom = "84f6d330bd190d4b0479651e52b3be3ce94ecdae"
+SRCREV:pn-gfplatdetect = "76c54b7f4832b88cb908fd6c7bc89f94e007afe9"
+SRCREV:pn-gfxml2dto = "cc0e343dced4f3c3c7619245b5671c38ab2e53b6"
+SRCREV:pn-ilitek = "22054aa6bb7f58e56713df3b3d921ab272da082e"
+SRCREV:pn-kernel-module-touchgpio = "a7fe1b2b6945545363ada5a0bcf591dad6afb9da"
+SRCREV:pn-libmdb = "df6dc596f444613240e3d58fa770cee8d09d5dcd"
+SRCREV:pn-linux-imx = "f203ccebf4d0a14f384bf60d3badb577ac79745f"
SRCREV:pn-linux-imx-kuk = "0258f07c61364958e3307da11a388e72baffb03a"
-SRCREV:pn-linux-seconorth = "b105037efec89ddc971c0d5ef0dd0d42defe3221"
-SRCREV:pn-qt-multi-screen-compositor = "6b54f65763c55774973a8d1d0c15330d434c6b3b"
-SRCREV:pn-seco-sharedconf = "c8df5bd7c335f35e602ccddf6557496f46ab04a7"
-SRCREV:pn-seco-show-demo = "638608c9fcc9da3d256fbc678ad391a5e1c96692"
-SRCREV:pn-seco-yocto-testsuite = "6a1a2cfbd09901dcbcbf6453cc6acb4fd4a62694"
-SRCREV:pn-secure-element-examples = "2cb9fad97376178b423a58cb6a8b4759ee0d93bb"
-SRCREV:pn-touchcal-conv = "c2e06bcb57f8aa3c2c44153eb4f99daa636648b7"
-SRCREV:pn-u-boot-seco-imx = "4d31be9883a189a2a1377618d4853ed6ed17d3f3"
-SRCREV:pn-xconfig = "1a9f8d423d257bb3d6f707557e094065c3038a8b"
-SRCREV:pn-yocto-install = "3a1e28b7d919d56070e1dfcdb3286e64d5ceeeb4"
+SRCREV:pn-linux-seconorth = "7189528c243848b58b17966589933ca73fceb4c7"
+SRCREV:pn-qt-multi-screen-compositor = "8a3fc0fffaacccccc2b651a9becfe5037b67adbc"
+SRCREV:pn-seco-sharedconf = "fc215163470f05745b338599af47b82e26885c83"
+SRCREV:pn-seco-show-demo = "08160a67b008fbe25bf125a403a412cdee14aca1"
+SRCREV:pn-seco-yocto-testsuite = "302625866d8d366ef55d32c7ab647dbc57f079b9"
+SRCREV:pn-secure-element-examples = "3efb976e9f0d7b8c1521380d2dd9cd9f9e3a0fab"
+SRCREV:pn-touchcal-conv = "d9fbc501d80f06230490c9b6866db4038721e4f7"
+SRCREV:pn-u-boot-seco-imx = "46b5de2f718dd2072d65fbacdde5a6dc58ee99b4"
+SRCREV:pn-xconfig = "cbb354bb716bd31e0e0913ad5d936905923a1f28"
+SRCREV:pn-yocto-install = "a84bf86cd58242221a85d4f841a0724da57fb324"
diff --git a/default.xml b/default.xml
index 0936f2cb..db88e080 100644
--- a/default.xml
+++ b/default.xml
@@ -21,10 +21,10 @@
<project name="meta-qt5.git" revision="5b71df60e523423b9df6793de9387f87a149ac42" remote="qt5-github" path="sources/meta-qt5" />
<project name="meta-freescale.git" revision="dd98526300937450d741c9b3403799632f417226" remote="fslc" path="sources/meta-freescale" />
<project name="meta-freescale-distro.git" revision="fc15f5003043da23212596be7366ae2547c308ad" remote="fslc" path="sources/meta-freescale-distro" />
- <project name="layers/meta-seconorth-machine" revision="7188f8ba358c71a43a138824db8d33af8e699d8b" remote="seco-ne" path="sources/meta-seconorth-machine" />
- <project name="layers/meta-seconorth-distro" revision="36e4f823799cd79cb2141254e228cbe20f7f5317" remote="seco-ne" path="sources/meta-seconorth-distro" />
- <project name="layers/meta-seconorth-nogplv3" revision="c4c6bac880763ebc9f003e6911b65f3de3571079" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
- <project name="config" revision="df0387c64c0b2cd7c76d87b3512f63da5ac5b8ce" remote="seco-ne" path=".conf" >
+ <project name="layers/meta-seconorth-machine" revision="ea6ee33e908a325c157993113e7d12ba193a00fe" remote="seco-ne" path="sources/meta-seconorth-machine" />
+ <project name="layers/meta-seconorth-distro" revision="8be28e295746a41a15a103081cb144415fe53cb6" remote="seco-ne" path="sources/meta-seconorth-distro" />
+ <project name="layers/meta-seconorth-nogplv3" revision="d6150e648f3e094064a6283ee656522127f090b0" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
+ <project name="config" revision="ce985857de627421fa088d65facb4ce35636407b" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
</project>
--
GitLab