From 2f1634cd20a5b927fec24d3be351e059a86f166f Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Wed, 6 Jul 2022 07:44:51 +0000
Subject: [PATCH] Integrate
gitlab-ci/CI-variable-scope-for-CI_PARAM_IMAGE-and-more and 1 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/86368d7eaf9cd4b9d017a7d39cdb1a4c5cfc2966
CI: pipeline yocto: Change scope of CI_PARAM_IMAGE, ... to fix fngsystem build
The variables CI_PARAM_IMAGE, CI_PARAM_DISTRO, CI_MACHINE have been
defined outside the job in the '.gitlab-ci.yml' file. This has a lower
precedence then variables defined inside the job, but it seems that
these variables are used in the scope of 'Trigger variables' when
available in the trigger job. These override the value set in the
template. As main results this made FNGSystem jobs build the normal
yocto.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/dc0503b699bc0fe529a8ca72216b18b0a093be0a
CI: Hardcode the artifacts path in the generated job description
Some gitlab update(?) seem to have changed the behaviour in
variable passing. In the scripts the variables are available
but in the artifacts path does not resolve them any more.
May be it has something to do with the introduction of the
trigger:forward keyword.
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index f39e65ab8d6dd..86368d7eaf9cd 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit f39e65ab8d6dd2d9ef1123b53ab66b2dff028481
+Subproject commit 86368d7eaf9cd4b9d017a7d39cdb1a4c5cfc2966
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a3c077a081d41..88393db39859f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: f39e65ab8d6dd2d9ef1123b53ab66b2dff028481
+ ref: 86368d7eaf9cd4b9d017a7d39cdb1a4c5cfc2966
file: 'manifest-integration-yocto.yml'
variables:
--
GitLab