From 7c6986162840e8700ebb31e59599afa86004a597 Mon Sep 17 00:00:00 2001
From: Lorenzo Pagliai <lorenzo.pagliai@seco.com>
Date: Thu, 9 May 2024 15:37:56 +0200
Subject: [PATCH] [INTEGRATION] Fix on integration branch name
Since now, the integration branch name created by a MR on the BSP
into the layer was formed by the BB_RECIPE_NAME followed by the name
of merge request source branch. Changing the BB_RECIPE_NAME with the
CI_PROJECT_PATH variable to fix a bug in the build process when
integration is performed and the integration branch is not found and
also for consistency reasons.
---
scripts/integrate_into_layer.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/integrate_into_layer.py b/scripts/integrate_into_layer.py
index de47d69..ce3bda1 100755
--- a/scripts/integrate_into_layer.py
+++ b/scripts/integrate_into_layer.py
@@ -84,7 +84,7 @@ def integrate_into_layer(
print("Using existing integration branch: %s" % integration_branch)
else:
# Create integration branch (delete former one if already exists)
- integration_branch = recipe_name + "/" + merge_request.source_branch
+ integration_branch = project.path + "/" + merge_request.source_branch
for ref in layer_repo.references:
if integration_branch == ref.name:
layer_repo.delete_head(ref)
--
GitLab