From a666806dfeb0db8832377c19e811a0b02473c7e6 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Wed, 31 Aug 2022 07:34:03 +0000
Subject: [PATCH] Integrate gitlab-ci/fix-manifest-commit and 8 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/3eef782efc50e805fd4640281aa8039d8594720e
deploy_gitlab_ci: integrate only correct projects into the manifest
Previously we integrated all projects into the manifest, even those that
belonged to a different manifest branch. That led to all manifests
having the same project revisions, even if they should be different due
to different intgrated project branches.
Save a list of integration sources for each manifest branch separately
now, so that we can check which project belongs to which manifest branch
later.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/2b851ac66a1f5fdcb623d3ab5bbd8a34cb809f85
Fix potential error message in retrigger job
TypeError: 'NoneType' object is not subscriptable
Example:
https://git.seco.com/seco-ne/yocto/infrastructure/ci-test/minimal-manifest/-/jobs/127610
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/c3fd0ecc141c9247cdefcc197b731333c1f14da0
Check if variable is defined before checking it value
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/c1be0f4b3e79ef80bf16e5a7c666e4756f0e4cd4
Fix jinja2 "or" operator
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/8da534ecfcdb13fde2b2e9e61aa8f4c54ec174fc
Run integration pipeline for target branch only
When we're integrating a single branch into a single manifest branch,
there is no need to run the intgeration pipeline for all configured
integrations, but only for those that match the target branch of the
current merge request.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/8c94b725b330b1ba40357042861bd5ec38130cd4
ci-test: add job to check for correct foo branch
This should catch an error where during a gitlab-ci merge process the
wrong foo branch is integrated into the manifest, which happened in
Yocto.
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/163c7e1e0cb0d73db504f9e64503d905b253902f
Add yml extension to jinja2 templates
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/59523aa0675472765aed61a56f44af4da5bb9107
check job: disable verbose output
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/28bf00653b2cc63a49a6e8189b148138c5446178
retrigger: add job states to log message
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index fd74201777c77..3eef782efc50e 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit fd74201777c771cf911112ce8e196f29f9598dd8
+Subproject commit 3eef782efc50e805fd4640281aa8039d8594720e
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 16bd2da3512c2..8f7820c7d0d50 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,11 +4,11 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: fd74201777c771cf911112ce8e196f29f9598dd8
+ ref: 3eef782efc50e805fd4640281aa8039d8594720e
file: 'manifest-integration.yml'
variables:
- GITLAB_CI_REVISION: fd74201777c771cf911112ce8e196f29f9598dd8
+ GITLAB_CI_REVISION: 3eef782efc50e805fd4640281aa8039d8594720e
BB_RECIPE_NAME: linux-imx-kuk
# FIXME: This is only necessary due to the following GitLab limitation:
# https://gitlab.com/gitlab-org/gitlab/-/issues/209904
--
GitLab