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

Integrate gitlab-ci/fix-build-merge-request-job and 1 more

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@7f68f307

Yocto manifest build: re-enable build:merge_request job

This job was accidentally disabled in 2e6c1b4, because it was included
in the generated child pipeline. This pipeline is not created on the
master, though, so the condition for the job was never met.

Move the job to the parent pipeline again, so that it gets executed on
the master like before.

--

Commit: seco-ne/yocto/infrastructure/gitlab-ci@970c7fd7

Re-add yamllint stage to ci test manifest pipeline

Was accidentally removed in previous commit.
parent 6a04cf81
No related branches found
No related tags found
2 merge requests!418Integrate gitlab-ci/fix-gitlab-ci-integration and 6 more,!387Update gitlab-ci
Subproject commit 2b2bc22010347ad46361e2d781a3d8ff745a1710 Subproject commit 7f68f3070c9732bd3df575f88e0e66971e068b09
...@@ -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: 2b2bc22010347ad46361e2d781a3d8ff745a1710 ref: 7f68f3070c9732bd3df575f88e0e66971e068b09
file: 'manifest-integration-yocto.yml' file: 'manifest-integration-yocto.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