From 25a7f4d20a2efbdcfbc6f7bd14a965d13f52c616 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot.north@seco.com>
Date: Mon, 25 Mar 2024 08:19:17 +0000
Subject: [PATCH] Integrate gitlab-ci/lpag/custom_conf and 7 more
--
Commit: https://git.seco.com/edgehog/infrastructure/gitlab-ci/-/commit/400ff327edd87681f2f63133957e9816b792cf85
[NOTIFY] Increase timeout for notify job
* The notify job needs to pull the artifacts from all previous jobs and
as the number of boards increase the timeout needs to increase
accordingly.
--
Commit: https://git.seco.com/edgehog/infrastructure/gitlab-ci/-/commit/34e9c6ddab72ac9198b54ad05a6edf9f8dcf0431
[SHA] Insert SHA of the manifest in artifacts name
* Instead of inserting the "weekly" string in the artifacts name, which is
already defined in the Azure path, we insert the short SHA for not
tagged version of Edgehog.
* Remove TAG_NAME variable from "latest" tagged artifacts
--
Commit: https://git.seco.com/edgehog/infrastructure/gitlab-ci/-/commit/b8dd7a1db61b9134ef96cab1689beceb422f68da
[KERNEL] Get main kernel version from bitbake
* Instead of setting the kernel version by variable, the kernel main
version is derived from the PREFERRED_VERSION of virtual/kernel used
by Yocto using bitbake commands.
* The following algorithm does not actually apply on the 'c31' and
'tanaro' boards, for which a different handling is applied.
--
Commit: https://git.seco.com/edgehog/infrastructure/gitlab-ci/-/commit/9314c567b1ea364b91d38ccda3d494257fed5bb8
[ARTIFACTS][NAME] Handle equal variables
* Since for Intel boards the PROCESSOR and BOARD variable values
coincides, it is necessary to handle this case and remove one of the
two variables from the artifact name.
--
Commit: https://git.seco.com/edgehog/infrastructure/gitlab-ci/-/commit/74498c1ca35dcb66fd51fe02dac0a6db9959fc5c
[INTEL] Add "intel" generic machine handling
* From now on, the compiled image for all Intel CPU-based SECO boards
will be unique and not separate for different processor generations/flavours.
* Bump of the kernel version for all Intel architectures to rel. 6.1.
* Set KERNEL variable separately for each board and avoid the
override of the value set in the generic yocto variables.
--
Commit: https://git.seco.com/edgehog/infrastructure/gitlab-ci/-/commit/88420cc892a4a7568dc0b724dee9e0f9453e6d65
[C72NL] Insert c72 Nano Lite configuration
--
Commit: https://git.seco.com/edgehog/infrastructure/gitlab-ci/-/commit/21286ffcc417228a7335b2fda1f9a6413b9df77a
[ARTIFACTS PATH] Fix on Azure path for imx8 boards
* Insert 'imx8' string in the path instead of the specific processor
type.
--
Commit: https://git.seco.com/edgehog/infrastructure/gitlab-ci/-/commit/b6968f7866814703fcfd59b38fc0f334f1840cc8
[CONF] Add handling of custom lines in local.conf
* Since custom projects may require to insert some flags in the
'conf/local.conf' file (e.g. software products commercial licences)
we define the handling of the CUSTOM_CONF variable to contain the lines
that need to be inserted in the file.
* Update documentation accordingly.
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index 12a33b1cb92c46..400ff327edd876 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit 12a33b1cb92c464af80f40ee1fa87bef6a1af2a4
+Subproject commit 400ff327edd87681f2f63133957e9816b792cf85
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be3939da709f5a..8ea42bcafd2e68 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,11 +4,11 @@
# ---------------------------------------------------------------------------------------
include:
- project: 'edgehog/infrastructure/gitlab-ci'
- ref: 12a33b1cb92c464af80f40ee1fa87bef6a1af2a4
+ ref: 400ff327edd87681f2f63133957e9816b792cf85
file: 'layers-integration.yml'
variables:
- GITLAB_CI_REVISION: 12a33b1cb92c464af80f40ee1fa87bef6a1af2a4
+ GITLAB_CI_REVISION: 400ff327edd87681f2f63133957e9816b792cf85
# FIXME: This is only necessary due to the following GitLab limitation:
# https://gitlab.com/gitlab-org/gitlab/-/issues/209904
# As soon as this gets fixed upstream, the hard-coded branch name should be removed.
--
GitLab