Skip to content
Snippets Groups Projects
Commit 867b40cc authored by GitBot's avatar GitBot
Browse files

Integrate gitlab-ci/fix-manifest-commit and 8 more

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@3eef782e

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: seco-ne/yocto/infrastructure/gitlab-ci@2b851ac6

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: seco-ne/yocto/infrastructure/gitlab-ci@c3fd0ecc

Check if variable is defined before checking it value

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@c1be0f4b

Fix jinja2 "or" operator

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@8da534ec

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: seco-ne/yocto/infrastructure/gitlab-ci@8c94b725

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: seco-ne/yocto/infrastructure/gitlab-ci@163c7e1e

Add yml extension to jinja2 templates

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@59523aa0

check job: disable verbose output

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@28bf0065

retrigger: add job states to log message
parent f93df259
No related branches found
No related tags found
2 merge requests!455CI: Update gitlab-ci,!138Integrate gitlab-ci/fix-manifest-commit and 8 more
Pipeline #28911 passed with stage
in 30 seconds
Subproject commit fd74201777c771cf911112ce8e196f29f9598dd8
Subproject commit 3eef782efc50e805fd4640281aa8039d8594720e
......@@ -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
# FIXME: This is only necessary due to the following GitLab limitation:
# https://gitlab.com/gitlab-org/gitlab/-/issues/209904
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment