From 958c8e49f420c9b4d5883506e19aa66a1fe0558a Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Tue, 21 Mar 2023 12:11:49 +0000
Subject: [PATCH] Integrate
gitlab-ci/use-project-path-in-integration-branch-name
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/e943a55e90671b62f1d3bab789670a40584e784f
Use project path instead of name in integration branch name
Usually project name and path are identical after project creation. It
is possible, though, to change the name of a project without changing
its path.
When triggering a pipeline on the integration branch, we are using the
CI_PROJECT_NAME variable to reference the project. Unexpectedly, this
variable contains the *path*, not the *name* of the project (see
https://gitlab.com/gitlab-org/gitlab/-/issues/20030).
Hence we have to use the project path in all other places where the
integration branch name is constructed in our Python code.
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index bd7025b8db711..e943a55e90671 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit bd7025b8db711b2d956e94bb2d8f7daabb76b564
+Subproject commit e943a55e90671b62f1d3bab789670a40584e784f
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0afe7bf1a54bf..a5cff71809e71 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,11 +4,11 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: bd7025b8db711b2d956e94bb2d8f7daabb76b564
+ ref: e943a55e90671b62f1d3bab789670a40584e784f
file: 'manifest-integration.yml'
variables:
- GITLAB_CI_REVISION: bd7025b8db711b2d956e94bb2d8f7daabb76b564
+ GITLAB_CI_REVISION: e943a55e90671b62f1d3bab789670a40584e784f
BB_RECIPE_NAME: linux-seconorth
# FIXME: This is only necessary due to the following GitLab limitation:
# https://gitlab.com/gitlab-org/gitlab/-/issues/209904
--
GitLab