From d52512c6736f113a28277702b1ebfdd6139b1804 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot.north@seco.com>
Date: Wed, 20 Mar 2024 12:52:28 +0000
Subject: [PATCH] Integrate gitlab-ci/fix-confluence-missing-mx6-section and 1
more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/ab19eb61134380b86d35ab0c5ec92a3033a272e4
CI: collect_release_information: jump to next pipeline if no deploy jobs found
See for error:
https://git.seco.com/seco-ne/yocto/infrastructure/ci-test/minimal-manifest/-/jobs/828261
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/ae764fbc3e56488b362fbb3ed37ed8465287db80
CI: Confluence page: Fix not created mx6 section
The function that merges the variables of the different jobs, i.e:
`MACHINE="mx6"`
`MACHINE="mx6ull"`
used python `in` to check if a value already exists.
But `"mx6" in "mx6ull"` is true, so mx6 was dropped.
This rewrites it, storing the variables in a set (which is unique
automatically) instead of space seperated strings.
Space seperation is added before printing the variables to be used on
on the shell.
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index 094983a..ab19eb6 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit 094983aec67b5e58813cf89d731d052c48804bac
+Subproject commit ab19eb61134380b86d35ab0c5ec92a3033a272e4
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a79c9f5..c492679 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,8 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: 094983aec67b5e58813cf89d731d052c48804bac
+ ref: ab19eb61134380b86d35ab0c5ec92a3033a272e4
file: 'manifest-integration.yml'
variables:
- GITLAB_CI_REVISION: 094983aec67b5e58813cf89d731d052c48804bac
+ GITLAB_CI_REVISION: ab19eb61134380b86d35ab0c5ec92a3033a272e4
--
GitLab