Skip to content
Snippets Groups Projects
Commit 62b4979e authored by GitBot's avatar GitBot Committed by Tim Jaacks
Browse files

Integrate gitlab-ci/multiple-integration-pipelines and 14 more

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@2c19f7ed

Deploy gitlab-ci to multiple branches

Add different integration jobs for different manifest branches. The
merge stage only has one job for each manifest, though, because
otherwise we cannot guarantee a consistent state for all branches.

Extend the deploy script for this purpose, so that it can deploy to
multiple manifest branches at once.

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@8840fc7e

Fix temporary dir path

We were passing the complete TemporaryDirectory object to the repo clone
function instead of just the path string, resulting in the repo being
cloned into a local dir "<TemporaryDirectory '/tmp/tmphwakypf8'>".

Fix this to actually use the generated temp dir.

This change makes it necessary to keep the TemporaryDirectory object
reference until we don't need the directory anymore, otherwise it will
be removed immediately.

--

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

Print less important output in grey color

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@1e3136cd

deploy_gitlab_ci: remove hard-coded integration targets

Get targets dynamically using the INTEGRATION variable instead.

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@02683cc1

Recurse to child pipelines on retrigger

This makes it possible to retrigger jobs that are not part of the
given pipeline but in any nested child pipeline of it.

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@0efe0f89

Ignore __pycache__ in scripts directory

--

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

Refactoring: rename arguments for consistency

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@59ce0ad8

Remove hard coded project and branch variables

MANIFEST_PROJECT, MASTER_BRANCH_MANIFEST, MASTER_BRANCH_PROJECT

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@68bd1200

Add rules for integration pipeline

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@02f90212

Improve log messages

--

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

commit_and_push: do not pass branch

Branch can be implicitly determined via the repo.

--

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

Throw and catch exception if git push fails

Using new function raise_if_error() of GitPython 3.1.25:
https://gitpython.readthedocs.io/en/stable/tutorial.html#handling-remotes

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@892c12fe

Create separate integration branches for each target branch

This makes it possible to integrate a project branch into different
branches of the same manifest project.

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@77f767c1

Generate integration pipeline based on CI variable

Evaluate the INTEGRATION variable to determine target project and branch
for integration instead of using the hard-coded variables. For now this
works only for a single integration per target project because the
integration branch name does not include the target branch and hence
would be identical when trying to integrate into multiple branches of
the same project.

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@5c2defce

CI: prepare to work also with renamed machine names lime seco-mx6
parent 2df88780
No related branches found
No related tags found
Loading
Subproject commit ef08f4efda5cd346d8750db962bb6dfd066dc3f7 Subproject commit 2c19f7ede2a689e14619908df1cea34a975be721
...@@ -4,9 +4,13 @@ ...@@ -4,9 +4,13 @@
# --------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------
include: include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
ref: ef08f4efda5cd346d8750db962bb6dfd066dc3f7 ref: 2c19f7ede2a689e14619908df1cea34a975be721
file: 'manifest-integration-yocto.yml' file: 'manifest-integration-yocto.yml'
variables: variables:
MASTER_BRANCH_PROJECT: master GITLAB_CI_REVISION: 2c19f7ede2a689e14619908df1cea34a975be721
BB_RECIPE_NAME: qt-multi-screen-compositor BB_RECIPE_NAME: qt-multi-screen-compositor
# FIXME: This is only necessary due to the following GitLab limitation:
# https://gitlab.com/gitlab-org/gitlab/-/issues/209904
# As soon as this gets fixed upstream, the hard-coded branch name should be removed.
MASTER_BRANCH: master
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