From cc1f592df99c6773a7fe9773603219edaf3da3a1 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Mon, 13 Jun 2022 14:55:01 +0000
Subject: [PATCH] Integrate gitlab-ci/set-master-branch-manifest-in-jinja2
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/d9660a80edc09242d507077a4059531a057f3184
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.
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index 2e6c1b4f..d9660a80 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit 2e6c1b4ff232614efbdbdcb66cabc4e33d066eb6
+Subproject commit d9660a80edc09242d507077a4059531a057f3184
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f37dd4f..40b3137f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,14 +4,14 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: 2e6c1b4ff232614efbdbdcb66cabc4e33d066eb6
+ ref: d9660a80edc09242d507077a4059531a057f3184
file: 'manifest.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH_MANIFEST: kirkstone
MASTER_BRANCH_PROJECT: kirkstone
- GITLAB_CI_CURRENT_REV: 2e6c1b4ff232614efbdbdcb66cabc4e33d066eb6
+ GITLAB_CI_CURRENT_REV: d9660a80edc09242d507077a4059531a057f3184
CI_PARAM_IMAGE: seconorth-image
CI_PARAM_DISTRO: seconorth-wayland
CI_PARAM_IMAGE_FNG: fngsystem-image
--
GitLab