From f575805ca19a38dc71ab7d57c2e69b6b55671588 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot.north@seco.com>
Date: Fri, 26 Apr 2024 09:01:41 +0000
Subject: [PATCH] Integrate gitlab-ci/keep_artifacts
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/de9851beff4cbb43172bc3e2ad4709f8d9e00790
ci: add a job to handle artifacts after merge
In the latest commit in the manifest it often happens, that the pipeline
does not contain the artifacts itself, but just a link to the pipeline of the MR.
Added a python script with corresponding GitLab CI job to launch this script.
The script searches for the latest pipelines for default branch in manifest repo,
and then decides either to keep or delete artifacts for particular build.
The build artifacts are kept for:
- the latest commit
- the last successful build
- the tagged commits (e.g. "fngsystem/47.0", "kirkstone/20.0")
---
.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 1299a9d6..de9851be 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit 1299a9d671826104a620e4b2fd8ce278dd306987
+Subproject commit de9851beff4cbb43172bc3e2ad4709f8d9e00790
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 60592dfc..8ebb8650 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,13 +4,13 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: 1299a9d671826104a620e4b2fd8ce278dd306987
+ ref: de9851beff4cbb43172bc3e2ad4709f8d9e00790
file: 'manifest-pipeline-yocto.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH: dunfell
- GITLAB_CI_REVISION: 1299a9d671826104a620e4b2fd8ce278dd306987
+ GITLAB_CI_REVISION: de9851beff4cbb43172bc3e2ad4709f8d9e00790
generate-build-pipeline:
variables:
diff --git a/SRCREV.conf b/SRCREV.conf
index 3b0d4a8e..5ed167a8 100644
--- a/SRCREV.conf
+++ b/SRCREV.conf
@@ -1,14 +1,14 @@
-SRCREV_pn-gf-productiontests = "a3a846e56bb2556eba6a5d8dfa7341dc5e21704b"
-SRCREV_pn-gfeeprom = "41bb804ce75a176ae1b7eed32df32e00bbaae5b0"
+SRCREV_pn-gf-productiontests = "b554c71b76223d3faec8bf5f19b518be5d23eba4"
+SRCREV_pn-gfeeprom = "5dc3b1e09bbfcf9be321fa6f2d7f5976dd695cc1"
SRCREV_pn-guf-show-demo = "dd131b8daf8023dea33165ab60c58d8f2e8f1f20"
-SRCREV_pn-libmdb = "5f6184a4e38dc8021eba85600c7581fca325f9be"
-SRCREV_pn-ltp-guf-tests = "176b9c7099add5112fc9def3430438f483c5efcd"
-SRCREV_pn-touchcal-conv = "ad3e9e644323ab3e2dc724487c214dbef25fc1dc"
+SRCREV_pn-libmdb = "48c6a4ab39a50f4e13b10899362b1013eb204725"
+SRCREV_pn-ltp-guf-tests = "6a2769171ac5465f7dc8f09e39810a15d79bb8da"
+SRCREV_pn-touchcal-conv = "8a95b9470805e2087e9753fd4ab88b97478769d9"
SRCREV_pn-gfxml2dto = "66160ee5b1c65111f2e011034b18baf83251090b"
SRCREV_pn-egalaxi2c = "0b203dde93a67edc4a42a843a2528edf59af0c22"
-SRCREV_pn-gfplatdetect = "3bb7ae89f765ca4a311b4aacf4e7218b8e0d512f"
-SRCREV_pn-xconfig = "f56713b634c1981c1882425de87ae02776c03415"
-SRCREV_pn-linux-guf = "05f5f3420b6ef743da2abe6e423321a25bd3be90"
-SRCREV_pn-linux-imx-kuk = "985e196b1992ae59cf9840b1e260e6de24412af6"
+SRCREV_pn-gfplatdetect = "dc4fbb8f29ddd983ef28875d47e731c651aab7de"
+SRCREV_pn-xconfig = "2d823d3aa5ba98c10e1b04f46bdec120a4094b9a"
+SRCREV_pn-linux-guf = "2d1099d115fa44a56bf744b645d42b3f52134d91"
+SRCREV_pn-linux-imx-kuk = "d489247e34ad88e5a7ed5126b30a92342f78815a"
SRCREV_pn-u-boot-imx = "a89b445ae46842ee508773052110807528403a47"
-SRCREV_pn-qt-multi-screen-compositor = "beb2d630d45f909cffbd78043ff977932a998c74"
+SRCREV_pn-qt-multi-screen-compositor = "5d55e0d822eab387d46ebf72675ce270c705e180"
diff --git a/default.xml b/default.xml
index 9a6b08e6..6c47e7c8 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="b6d2314b8715dea328079b2023ff2c42848cd07e" remote="seco-ne" path="sources/meta-seconorth-machine" />
- <project name="layers/meta-seconorth-distro" revision="abb0f3ce70e93eecb2b29aae2971ded139f0e114" remote="seco-ne" path="sources/meta-seconorth-distro" />
- <project name="layers/meta-seconorth-nogplv3" revision="7f6c0550d548513cc0138d6705a4674ae8ee9314" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
- <project name="config" revision="4cd1555453be46d530c29bda450f799c36e11035" remote="seco-ne" path=".conf" >
+ <project name="layers/meta-seconorth-machine" revision="29408ba0bf3d6f0c599c5cf8280412cfee687a82" remote="seco-ne" path="sources/meta-seconorth-machine" />
+ <project name="layers/meta-seconorth-distro" revision="da82ba57a0c85d6c857b3e76c5c9082ada1f94d0" remote="seco-ne" path="sources/meta-seconorth-distro" />
+ <project name="layers/meta-seconorth-nogplv3" revision="33b55b41ed85765ea9f9879f0aae3d1939fd47cd" remote="seco-ne" path="sources/meta-seconorth-nogplv3" />
+ <project name="config" revision="5ac7e6799d35a3eab6add376e6b724099e1a9fbe" remote="seco-ne" path=".conf" >
<linkfile dest="setup-environment" src="setup-environment" />
</project>
--
GitLab