Skip to content
Snippets Groups Projects
Commit cc1f592d 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 9a4f246e
No related branches found
No related tags found
1 merge request!690Update gitlab-ci
Subproject commit 2e6c1b4ff232614efbdbdcb66cabc4e33d066eb6 Subproject commit d9660a80edc09242d507077a4059531a057f3184
...@@ -4,14 +4,14 @@ ...@@ -4,14 +4,14 @@
# --------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------
include: include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
ref: 2e6c1b4ff232614efbdbdcb66cabc4e33d066eb6 ref: d9660a80edc09242d507077a4059531a057f3184
file: 'manifest.yml' file: 'manifest.yml'
variables: variables:
MANIFEST_PROJECT_ID: 1725 MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH_MANIFEST: kirkstone MASTER_BRANCH_MANIFEST: kirkstone
MASTER_BRANCH_PROJECT: kirkstone MASTER_BRANCH_PROJECT: kirkstone
GITLAB_CI_CURRENT_REV: 2e6c1b4ff232614efbdbdcb66cabc4e33d066eb6 GITLAB_CI_CURRENT_REV: d9660a80edc09242d507077a4059531a057f3184
CI_PARAM_IMAGE: seconorth-image CI_PARAM_IMAGE: seconorth-image
CI_PARAM_DISTRO: seconorth-wayland CI_PARAM_DISTRO: seconorth-wayland
CI_PARAM_IMAGE_FNG: fngsystem-image CI_PARAM_IMAGE_FNG: fngsystem-image
......
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