From bb12a70a0788e788ef0354ab3ab99abf66b5e8d3 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Fri, 8 Sep 2023 16:20:59 +0000
Subject: [PATCH] Integrate gitlab-ci/remove-release-name-from-deploy-target
and 10 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/f2a29f53ec65534788ab0cc03a562bcffa6b2ffe
Refactoring: remove RELEASE_NAME from deploy targets
Append it to the configured target at the deploy class level instead.
This removes the need for eval'ing the variables before usage.
RELEASE_NAME can be used directly at the class level because it is known
from build-version.env.
This makes the deploy behavior identical to the Azure stage.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/e136e5e281d3f98b37927ca303f96339606231ff
Remove top-level "release" folder from package
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/1d5e479f8efd50e490f090ea7c89344f4142982e
Define MACHINE variable on job level
Instead of passing MACHINE from stage to stage or loading it from
testdata.json, use the original value from the Jinja2 loop and set it
directly for each job where it is used.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/cdd4702353c145d18e48be7319cc75dfe082b6e9
Introduce separate variables to set RELEASE_NAME and RELEASE_VERSION
The expressions to calculate RELEASE_NAME and RELEASE_VERSION cannot be
stored within these variables themseselves. If set on the trigger level,
they would override the calculated values in build-version.env then,
as trigger variables always have the highest precedence.
Use separate variables RELEASE_VERSION_EXPRESSION and
RELEASE_NAME_EXPRESSION to define how RELEASE_VERSION and RELEASE_NAME
are calculated instead.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/372d192b9154ac48be662b83f66895671d91dd98
Use RELEASE_VERSION and RELEASE_NAME from build-version job
Instead of passing these variables from stage to stage or regenerating
their values in later stages, use the ones set in the build-version job
at all places.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/cad30c200f9780f4f6c74dcb9e24d46c0422960b
Remove RELEASE_SUFFIX variable
The RELEASE_NAME variable can be set directly now, so there's no need to
have a dedicated RELEASE_SUFFIX anymore. A previous configuration like
RELEASE_SUFFIX: "-custom"
can now be achieved using:
RELEASE_NAME: "Yocto-${RELEASE_VERSION}-custom"
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/922f49f8a5bc2f36720fa14d3acde6285a6376b1
Add yocto version job
This adds a machine-independent job "build-version" which populates the
RELEASE_VERSION and RELEASE_NAME variables, so that following jobs can
use these without depending on the various build jobs.
The variables can be set from the trigger job in a project's
`.gitlab-ci.yml` file. They are eval'ed before saving them to
version.env, so we can use deferred variable expansion or even command
execution to construct their values. This mechanism is already used for
the Flash-N-Go System variables.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/073ae81e71d957092723f6f91f4b99bb8d1d9e68
LAVA: rename MACHINE to LAVA_MACHINE
Rename variable in order to avoid confusion with the original MACHINE
variable used everywhere else. Also rename the local Jinja2 variable to
include an underscore to make naming consistent.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/a91baa55c16eb86ffe5d0b440963e99198b15209
Clean build.env before writing
This had been accidentally removed in
5e36715ef6cf98df4c1b98fedddc0c3c50ed4040.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/1860ca8ec2942c3db92416cf469e2e41bcb0f9e9
Remove LOG_PREFIX variable
This was used in times when the same code was executed from different
places. We don't do that anymore, so the variable is obsolete.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/3d2dbe4dc21e4801ccb3edc22dff9b021d93e8a8
Documentation: update job generation chapter
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index 17b87f84e71a3..f2a29f53ec655 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit 17b87f84e71a326169355a10f896f30924661adc
+Subproject commit f2a29f53ec65534788ab0cc03a562bcffa6b2ffe
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 172093f6b7229..6a9c0b988190a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,9 +4,9 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: 17b87f84e71a326169355a10f896f30924661adc
+ ref: f2a29f53ec65534788ab0cc03a562bcffa6b2ffe
file: 'manifest-integration.yml'
variables:
- GITLAB_CI_REVISION: 17b87f84e71a326169355a10f896f30924661adc
+ GITLAB_CI_REVISION: f2a29f53ec65534788ab0cc03a562bcffa6b2ffe
BB_RECIPE_NAME: linux-imx-kuk
--
GitLab