From a193e09c89cf5d19667f1f45d771c8970f802956 Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Tue, 21 Jun 2022 12:10:31 +0000
Subject: [PATCH] Integrate gitlab-ci/fix-build-merge-request-job and 1 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/7f68f3070c9732bd3df575f88e0e66971e068b09
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: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/970c7fd79873ce1e0a37db369b5f99c793239878
Re-add yamllint stage to ci test manifest pipeline
Was accidentally removed in previous commit.
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index 2b2bc220..7f68f307 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit 2b2bc22010347ad46361e2d781a3d8ff745a1710
+Subproject commit 7f68f3070c9732bd3df575f88e0e66971e068b09
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f708320..66a8b488 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,14 +4,14 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: 2b2bc22010347ad46361e2d781a3d8ff745a1710
+ ref: 7f68f3070c9732bd3df575f88e0e66971e068b09
file: 'manifest.yml'
variables:
MANIFEST_PROJECT_ID: 1725
MASTER_BRANCH_MANIFEST: kirkstone
MASTER_BRANCH_PROJECT: kirkstone
- GITLAB_CI_CURRENT_REV: 2b2bc22010347ad46361e2d781a3d8ff745a1710
+ GITLAB_CI_CURRENT_REV: 7f68f3070c9732bd3df575f88e0e66971e068b09
CI_PARAM_IMAGE: seconorth-image
CI_PARAM_DISTRO: seconorth-wayland
CI_PARAM_IMAGE_FNG: fngsystem-image
--
GitLab