From c36f638957536a8d3a592c43185f6e11ea442ed2 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot.north@seco.com>
Date: Mon, 29 Jul 2024 08:57:56 +0000
Subject: [PATCH] Integrate gitlab-ci/PBB-32-flash-n-go-deploy-folder-no-suffix
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/7bd78810f007a34d91591c5cc66008aa89c52fd1
PBB-32 Fix suffix addition in FNGo pipeline for custom projects
due to an issue in GitLab where escaped variables are not correctly
passed to child pipelines, a workaround is required.
As a result, we use raw variables.
The DEFERRED_RELEASE_VERSION variable was introduced for this purpose.
However, for custom builds, we have an additional place where we modify
the DEFERRED_RELEASE_VERSION variable to add a suffix.
Therefore, extra interim variables need to be added to handle the workaround
and ensure we get the raw variable in the end.
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index 83f4f61..7bd7881 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit 83f4f6105c29cecfb6d636b6cfea6c8f5214a54b
+Subproject commit 7bd78810f007a34d91591c5cc66008aa89c52fd1
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 72dce77..f6bd9e3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,8 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: 83f4f6105c29cecfb6d636b6cfea6c8f5214a54b
+ ref: 7bd78810f007a34d91591c5cc66008aa89c52fd1
file: 'manifest-integration.yml'
variables:
- GITLAB_CI_REVISION: 83f4f6105c29cecfb6d636b6cfea6c8f5214a54b
+ GITLAB_CI_REVISION: 7bd78810f007a34d91591c5cc66008aa89c52fd1
--
GitLab