diff --git a/gitlab-ci-integration-pipelines.yml.jinja2 b/gitlab-ci-integration-pipelines.yml.jinja2 index 4964359d0f0349c3a171e1a8167b521af2b7be0a..6977f22409d1796fd2626bc050f2a6280bfea362 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 06c3269f75ae18610a8d3376855a5e24ec1f5909..77cfa9b58afc86fa6dffd4c66f2da981015db3a8 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 04b2dc1b8d01bc38cdbce8e03a0c278f92ea7f8f..9a9f281edb4b81374357776c3d3e31643931ca0b 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 e940204b8d03e41b93e5b63b6d062ea4513099bf..a776406f43e9b5a688d3945e431f066095de3e6e 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: