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

Integrate gitlab-ci/fix-reuse-of-outdated-integration-branch and 2 more

--

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

CI: Add check if integration branch is on top of target branch before reusing it

The integration branch was reused even if there where new commits on the
target branch, which could lead into reverting some changes.
This adds a check, if the existing integration branch is directly based
on the target branch and deletes it if not.

--

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

CI: Pull new changelog_generator image, add token to the call.

BCS 746-000785

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@968886c0

Update README.md: Add description on the gitlab-ci CI and how to deploy
parent 554095d5
No related branches found
No related tags found
2 merge requests!418Integrate gitlab-ci/fix-gitlab-ci-integration and 6 more,!352Update gitlab-ci
Subproject commit f2b7ec9024a50695f1e4daa3e4b52fe27112d96f Subproject commit bcb6076bc67279ac451d5d0d3449bbc89c4830d6
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# --------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------
include: include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
ref: f2b7ec9024a50695f1e4daa3e4b52fe27112d96f ref: bcb6076bc67279ac451d5d0d3449bbc89c4830d6
file: 'manifest-integration.yml' file: 'manifest-integration.yml'
variables: variables:
......
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