From 4a1dd1a6c56d9fbc36bd7039d9f15cfb4bec4e02 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot.north@seco.com>
Date: Thu, 16 May 2024 18:36:09 +0000
Subject: [PATCH] Integrate gitlab-ci/report-image-diff-rework and 1 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/212a3af923042ec24a52c738ac5ca1b0348a3de4
Move report_image-diff to downstream pipeline
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/cbf168ebd86b09d06b8d7d7e559e5bcedd0607dd
build:credentials: Fix error when storing credentials in cache
The credentials helper wasn't storing the credentials in the cache.
Seemingly, the echo added whitespaces at the beginning of the lines
which can't be interpreted by the git credential approve command.
Also the USERNAME was renamed to TOKEN_USER because the variable is
already filled with the system users name.
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index d09e3a9655559..212a3af923042 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit d09e3a9655559495e9aeff194e3ea44a2acdb315
+Subproject commit 212a3af923042ec24a52c738ac5ca1b0348a3de4
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2865b247e6032..cb46834404515 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,11 +4,11 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: d09e3a9655559495e9aeff194e3ea44a2acdb315
+ ref: 212a3af923042ec24a52c738ac5ca1b0348a3de4
file: 'manifest-integration.yml'
variables:
- GITLAB_CI_REVISION: d09e3a9655559495e9aeff194e3ea44a2acdb315
+ GITLAB_CI_REVISION: 212a3af923042ec24a52c738ac5ca1b0348a3de4
BB_RECIPE_NAME: linux-seco-mtk
# FIXME: This is only necessary due to the following GitLab limitation:
# https://gitlab.com/gitlab-org/gitlab/-/issues/209904
--
GitLab