From 9e9ef3fdef77cd0f05dd8f38048f77ca28349a9a Mon Sep 17 00:00:00 2001
From: gitbot <gitbot.north@seco.com>
Date: Thu, 23 May 2024 11:52:24 +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/bd4caeae042c7e51f2982e06e3f2531292656a7e
report_image_diff: rework variables extraction
The current solution makes too much assumptions about the pipeline and needs
to reimplement some of the gitlab yaml interpretion.
The new version of the script extracts MACHINE and DISTRO from the jobs themselves:
- MACHINE is part of the build job name ("build-$MACHINE");
- DISTRO is printed by bitbake and can be found in build log.
Typos
--
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 d09e3a9..bd4caea 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit d09e3a9655559495e9aeff194e3ea44a2acdb315
+Subproject commit bd4caeae042c7e51f2982e06e3f2531292656a7e
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5d393cd..4c01d5d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,9 +4,9 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: d09e3a9655559495e9aeff194e3ea44a2acdb315
+ ref: bd4caeae042c7e51f2982e06e3f2531292656a7e
file: 'manifest-integration.yml'
variables:
- GITLAB_CI_REVISION: d09e3a9655559495e9aeff194e3ea44a2acdb315
+ GITLAB_CI_REVISION: bd4caeae042c7e51f2982e06e3f2531292656a7e
BB_RECIPE_NAME: secure-element-examples
--
GitLab