From ad5f32deddcde24e4af3b9bd8129b4ed60150340 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@seco.com>
Date: Thu, 19 Oct 2023 12:51:13 +0000
Subject: [PATCH] Integrate gitlab-ci/reverse-pipeline-cancellation-order and 6
more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/3697b4ea6a1610772369cb1559cd810502b51029
cancel_pipelines: reverse order of cancellation
Cancel parent pipeline first before cancelling its children in order not
to have failed parent pipelines (trigger jobs are failed if their
downstream pipeline is cancelled).
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/5f4ca2fbb3cbf8dd7cc4d1817ad107c89971a230
cancel_pipelines: list actually cancelled (child-)pipelines
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/c80cba846b022eb2a074ae4ec5711a094755b246
Cancel all pipelines on newer commit
We already canceled running pipelines before. Gitlab, however, might
have already canceled previous pipelines automatically, but without
canceling their child pipelines.
Remove the "running" status filter when cancelling pipelines, so that
also already cancelled pipelines will be included.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/84eb6e22684cf2878dbb4a8e78b8a3ad448a1f21
Revert "Cancel all pipelines on newer commit"
This reverts commit f7582b74e7c565d55bb8a0315fe75c4ab4385fa2.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/f7582b74e7c565d55bb8a0315fe75c4ab4385fa2
Cancel all pipelines on newer commit
We already canceled running pipelines before. Gitlab, however, might
have already canceled previous pipelines automatically, but without
canceling their child pipelines.
Extend the mechanism now to cancel all pipelines up to and including
"running" as well as "canceled" states.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/0ec55c07a3398c13af5aefdaacb02ca0bf5c4142
Fix list() call in update_submodule
Here we don't just iterate over the results, so we have to use
"all=True" instead of "as_list=False". See previous commit for
explaination.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/4b3a517e57cec00402031740eba300250e810213
Make sure to get all items on Gitlab list() calls
The list() call on Gitlab classes uses pagination per default. If the
number of items exceeds a certain limit, we only get a part of the
results. We can pass "all=True" to the calls in order to disable
pagination and get all results.
If we're looping over the items, though, the recommended way of getting
them is to use a generator object, which works calling list() with
"as_list=False". See documentation for reference:
https://python-gitlab.readthedocs.io/en/v2.10.1/api-usage.html#pagination
Note: the "as_list" argument is deprecated in newer versions of the
python-gitlab library, in favor of the newer "iterator=True":
https://python-gitlab.readthedocs.io/en/v3.6.0/changelog.html#feature
We are using v2.10.1 of the library, though, so this commit also updates
calls using the new way, which is not working with our version.
---
.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 c292d144..3697b4ea 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit c292d1447f500262d733df620d291333ceed4a7b
+Subproject commit 3697b4ea6a1610772369cb1559cd810502b51029
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d0190a2..e18a9804 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,13 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: c292d1447f500262d733df620d291333ceed4a7b
+ ref: 3697b4ea6a1610772369cb1559cd810502b51029
file: 'manifest-pipeline-yocto.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH: kirkstone
- GITLAB_CI_REVISION: c292d1447f500262d733df620d291333ceed4a7b
+ GITLAB_CI_REVISION: 3697b4ea6a1610772369cb1559cd810502b51029
generate-build-pipeline:
variables:
diff --git a/SRCREV.conf b/SRCREV.conf
index ac139438..3e0fefc1 100644
--- a/SRCREV.conf
+++ b/SRCREV.conf
@@ -1,22 +1,22 @@
-SRCREV:pn-atmel-mxt = "d0b62ac1bfe3387076f27c65fd05661bfa5ec5ac"
-SRCREV:pn-egalaxi2c = "1abfaf0f46f0f31e030740cf55780c75d54f61f5"
-SRCREV:pn-emc-test-suite = "0bc7a2be9d7413995635153c87cc3aca91f67494"
-SRCREV:pn-gf-productiontests = "9f52cac91273b3caa44172c9fedfaf2b3aad131f"
-SRCREV:pn-gfeeprom = "5d381236e4a8a63610dd80f8aae17651db7a427b"
-SRCREV:pn-gfplatdetect = "031a125fe53f2e3b80ee656f8f3c2bf71cf1204b"
-SRCREV:pn-gfxml2dto = "efba661c9d25f2fc1894f5f6011d79756f42180b"
-SRCREV:pn-ilitek = "3b15069e92f18e436da70ace36aabda80e69b3de"
-SRCREV:pn-kernel-module-touchgpio = "e8b7b21b45dc4aa7dd2331da7f2894f588675b54"
-SRCREV:pn-libmdb = "7cd10f6f28432c84861822fae5bf4eb9801c1a9e"
-SRCREV:pn-linux-imx = "fbeb99afed75641dc4efa209d6ee1d85e2dc056e"
+SRCREV:pn-atmel-mxt = "d0b588769fe87d2d36d3723b5f06c8a474480d9e"
+SRCREV:pn-egalaxi2c = "19ebd95f03550b760c3fa7ebd15dfb04353edc9c"
+SRCREV:pn-emc-test-suite = "e63ef5ba3c5924337916c401f9cfb2c9281e2795"
+SRCREV:pn-gf-productiontests = "58e5166e19df82256f4545bec0a2a7e57d81be2b"
+SRCREV:pn-gfeeprom = "9cd374ff16bb8da5c2ee88f6391c8f9991da7228"
+SRCREV:pn-gfplatdetect = "03ceaa604c9147d14d6e4fe558e4bb8cd3e50b3f"
+SRCREV:pn-gfxml2dto = "d3d113a89d1a0e4a6621eb7b83b8d37484548a09"
+SRCREV:pn-ilitek = "bd332939b43185f47a5c119fcaf3341e6aef8153"
+SRCREV:pn-kernel-module-touchgpio = "8c1119e5de5c6d97bd42516ffe6748edf1a10a8c"
+SRCREV:pn-libmdb = "9bd8eb03e499575ffe0ca68c6152b188492c33e1"
+SRCREV:pn-linux-imx = "881b7d3547a0327ba9f8cd092f343b326bb81320"
SRCREV:pn-linux-imx-kuk = "0258f07c61364958e3307da11a388e72baffb03a"
-SRCREV:pn-linux-seconorth = "9bfd91ab53172eb6dc6622168c367b7c2915af00"
-SRCREV:pn-qt-multi-screen-compositor = "c9b43c3a6082bdf6afff7c21868ff00a70de89dc"
-SRCREV:pn-seco-sharedconf = "b2019d6d09751e0de0812ca88e627d75fb44ce8e"
-SRCREV:pn-seco-show-demo = "50f8ae709d9f8aee7359981bd0a7f0c91442c34a"
-SRCREV:pn-seco-yocto-testsuite = "71807abf3dd18dcf6f67483395247c89e2475923"
-SRCREV:pn-secure-element-examples = "57880d077794adcf3c96c090e2e464dff6af165b"
-SRCREV:pn-touchcal-conv = "d42f9d4556e3d832be37f01d06bbd75684dbab5e"
-SRCREV:pn-u-boot-seco-imx = "dab432898192b94b9d2205ab6a41b242f35dba11"
-SRCREV:pn-xconfig = "f8f230309d8c2cf2a93ff622e216ae0ae168afef"
-SRCREV:pn-yocto-install = "02b2e62ecf801ac5a5b554b35292028373b31245"
+SRCREV:pn-linux-seconorth = "13297ec706b9aa9dc392a07c870173e41e9690d2"
+SRCREV:pn-qt-multi-screen-compositor = "bb88b4761403d3266e8001eed2391b6607527b5f"
+SRCREV:pn-seco-sharedconf = "9ff856216272eb0e7d8b0a29ae15ec7f0aaf6f93"
+SRCREV:pn-seco-show-demo = "07bbfbf44fc80121400322aa2433093a11085817"
+SRCREV:pn-seco-yocto-testsuite = "e106f7c3c92e8c7ace5039c5b6813302a09e9173"
+SRCREV:pn-secure-element-examples = "39b95eae18f2774c1ea1b4e48d9353f97897999e"
+SRCREV:pn-touchcal-conv = "613c600dd69eb700676924075e1d1040d853b796"
+SRCREV:pn-u-boot-seco-imx = "4e9036f985c309820e513f93cfbbd8cca57f4ee0"
+SRCREV:pn-xconfig = "2837201de979ae4a36239363758ea43f8eed6740"
+SRCREV:pn-yocto-install = "59929004d3442609d5376c7d2bd2db468ed49213"
diff --git a/default.xml b/default.xml
index 182fd335..3a647c32 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="81b008cd5a93fb209ae2fca4fd69fb3df340e310" remote="seco-ne" path="sources/meta-seconorth-machine" />
- <project name="layers/meta-seconorth-distro" revision="9f9b5ddbe72dfa2f6577c8348bb1cadce152923e" remote="seco-ne" path="sources/meta-seconorth-distro" />
- <project name="layers/meta-seconorth-nogplv3" revision="4f9a345225ca5fa76b5a2f7bfb0b8af12a4ae360" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
- <project name="config" revision="720a98ec3e03959eec7349650c10361665be3355" remote="seco-ne" path=".conf" >
+ <project name="layers/meta-seconorth-machine" revision="3d6a146414eef9735c458cd8f3a4c75a48558af3" remote="seco-ne" path="sources/meta-seconorth-machine" />
+ <project name="layers/meta-seconorth-distro" revision="46c20aee6308a5bafb08b17fa8e578faac94861b" remote="seco-ne" path="sources/meta-seconorth-distro" />
+ <project name="layers/meta-seconorth-nogplv3" revision="128d3d95ccda0caf657eec289296be3940efbd44" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
+ <project name="config" revision="13198e9de2acbc672e4a0fb51ed80fede4ef97ec" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
</project>
--
GitLab