From 7f5004883686f95a19d2bd2f85248d88bf00dfc8 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@seco.com>
Date: Mon, 18 Sep 2023 06:40:56 +0000
Subject: [PATCH] Integrate gitlab-ci/hide-stages-if-variables-not-set and 4
more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/64dc51d3244909d5ce3dd1a99580d60fce0f0a64
Use regex operator to check for multiple variables
The "&&" operator does not work as expected when checking if multiple
variables are set.
See for reference:
https://gitlab.com/gitlab-org/gitlab/-/issues/321371
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/89fbce242cdf1b3d2e17146af639abc18438037c
Hide Confluence stage if confluence variables not set
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/db50e93bf77012701c287e6c0a98f5ae9ab3be5f
Hide deploy stage if DEPLOY_RELEASE_TARGET not set
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/f4aa0048f11967abce493810aefb429a13ded32f
Hide FTP stage if DEPLOY_FTP_TARGET not set
This makes the variable HIDE_FTP_UPLOAD_STAGE obsolete, because we can
hide the FTP stage now by setting DEPLOY_FTP_TARGET to an empty string.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/409c4f27b64736a690c9a9dd6fdd7e197e48d6ad
Do not run CI test sub-pipeline on master
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index a731b15..64dc51d 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit a731b1569292fc3742fa16fc2328524ea2a93f9f
+Subproject commit 64dc51d3244909d5ce3dd1a99580d60fce0f0a64
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 973d98f..7413368 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,9 +4,9 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: a731b1569292fc3742fa16fc2328524ea2a93f9f
+ ref: 64dc51d3244909d5ce3dd1a99580d60fce0f0a64
file: 'manifest-integration.yml'
variables:
- GITLAB_CI_REVISION: a731b1569292fc3742fa16fc2328524ea2a93f9f
+ GITLAB_CI_REVISION: 64dc51d3244909d5ce3dd1a99580d60fce0f0a64
BB_RECIPE_NAME: egalaxi2c
--
GitLab