From 19a0c8f0e2eee77d75a6b207609a7c62aea3feb3 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot.north@seco.com>
Date: Thu, 23 May 2024 13:18:25 +0000
Subject: [PATCH] Integrate gitlab-ci/fix_collect_confluence
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/58554035ea3de924cc0670f811c2664224b22d76
scripts:release_info: Deep copy dict in merge_variables
Without the deep copy, the merge operation manipulates the dict it is
storing the new values in.
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index bd4caea..5855403 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit bd4caeae042c7e51f2982e06e3f2531292656a7e
+Subproject commit 58554035ea3de924cc0670f811c2664224b22d76
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82d3dad..b02975e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,9 +4,9 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: bd4caeae042c7e51f2982e06e3f2531292656a7e
+ ref: 58554035ea3de924cc0670f811c2664224b22d76
file: 'manifest-integration.yml'
variables:
- GITLAB_CI_REVISION: bd4caeae042c7e51f2982e06e3f2531292656a7e
+ GITLAB_CI_REVISION: 58554035ea3de924cc0670f811c2664224b22d76
BB_RECIPE_NAME: seco-yocto-testsuite
--
GitLab