From 12a33b1cb92c464af80f40ee1fa87bef6a1af2a4 Mon Sep 17 00:00:00 2001
From: Lorenzo Pagliai <lorenzo.pagliai@seco.com>
Date: Mon, 19 Feb 2024 11:56:11 +0100
Subject: [PATCH] [FIX] trigger:include config after GitLab upgrade
In the upgrade from GitLab release 15.4.2 to GitLab release 16.8.2 this
syntax fix is necessary in order for all the integration pipelines to start
correctly
---
gitlab-ci-integration-pipelines.yml.jinja2 | 6 +++---
layers-integration-pipelines.yml.jinja2 | 6 +++---
manifest-integration-pipelines.yml.jinja2 | 6 +++---
scripts/get_integration_sources.py | 4 +---
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/gitlab-ci-integration-pipelines.yml.jinja2 b/gitlab-ci-integration-pipelines.yml.jinja2
index 4964359..6977f22 100644
--- a/gitlab-ci-integration-pipelines.yml.jinja2
+++ b/gitlab-ci-integration-pipelines.yml.jinja2
@@ -29,9 +29,9 @@ stages:
trigger:
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/infrastructure/gitlab-ci'
- ref: {{ GITLAB_CI_REVISION }}
- file: gitlab-ci-integration-jobs.yml
+ - project: '${CI_PROJECT_ROOT_NAMESPACE}/infrastructure/gitlab-ci'
+ ref: {{ GITLAB_CI_REVISION }}
+ file: gitlab-ci-integration-jobs.yml
strategy: depend
{% endfor %}
\ No newline at end of file
diff --git a/layers-integration-pipelines.yml.jinja2 b/layers-integration-pipelines.yml.jinja2
index 06c3269..77cfa9b 100644
--- a/layers-integration-pipelines.yml.jinja2
+++ b/layers-integration-pipelines.yml.jinja2
@@ -35,9 +35,9 @@ stages:
BB_RECIPE_NAME: {{ BB_RECIPE_NAME }}
trigger:
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/infrastructure/gitlab-ci'
- ref: ${GITLAB_CI_REVISION}
- file: layers-integration-jobs.yml
+ - project: '${CI_PROJECT_ROOT_NAMESPACE}/infrastructure/gitlab-ci'
+ ref: ${GITLAB_CI_REVISION}
+ file: layers-integration-jobs.yml
strategy: depend
{% endif %}
diff --git a/manifest-integration-pipelines.yml.jinja2 b/manifest-integration-pipelines.yml.jinja2
index 04b2dc1..9a9f281 100644
--- a/manifest-integration-pipelines.yml.jinja2
+++ b/manifest-integration-pipelines.yml.jinja2
@@ -34,9 +34,9 @@ stages:
BB_RECIPE_NAME: {{ BB_RECIPE_NAME }}
trigger:
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/infrastructure/gitlab-ci'
- ref: ${GITLAB_CI_REVISION}
- file: manifest-integration-jobs.yml
+ - project: '${CI_PROJECT_ROOT_NAMESPACE}/infrastructure/gitlab-ci'
+ ref: ${GITLAB_CI_REVISION}
+ file: manifest-integration-jobs.yml
strategy: depend
{% endif %}
diff --git a/scripts/get_integration_sources.py b/scripts/get_integration_sources.py
index e940204..a776406 100755
--- a/scripts/get_integration_sources.py
+++ b/scripts/get_integration_sources.py
@@ -26,9 +26,7 @@ def get_integration_sources(manifest_project: str, manifest_branch: str, group:
regex = [f":{manifest_project}:{manifest_branch}$"]
manifest_subgroup = '/'.join(manifest_project.split('/')[:-1])
for arch in architecture:
- regex.append(f"{manifest_subgroup}/meta-seco-{arch}:{manifest_branch}$")
- # Include minimal-meta-seco for testing purposes
- regex.append(f"{manifest_subgroup}/minimal-meta-seco:{manifest_branch}$")
+ regex.append(f"{manifest_subgroup}/layers/seco/meta-seco-{arch}:{manifest_branch}$")
for project in group.projects.list():
try:
--
GitLab