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

Integrate gitlab-ci/set-master-branch-manifest-in-jinja2

--

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

build-jobs.jinja2: Specify master branch variable again

If the MASTER_BRANCH_MANIFEST variable is set in the manifest's
.gitlab-ci.yml file, it may not find its way to the generated job,
if it is not explicitly set during generation.
That is done with this patch.
parent 0af24422
No related branches found
No related tags found
2 merge requests!418Integrate gitlab-ci/fix-gitlab-ci-integration and 6 more,!369Integrate gitlab-ci/move-python-scripts-to-subfolder
Subproject commit 2e6c1b4ff232614efbdbdcb66cabc4e33d066eb6
Subproject commit d9660a80edc09242d507077a4059531a057f3184
......@@ -4,7 +4,7 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
ref: 2e6c1b4ff232614efbdbdcb66cabc4e33d066eb6
ref: d9660a80edc09242d507077a4059531a057f3184
file: 'manifest-integration.yml'
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