From 6dc103f3d6e7d9f0af942f5f48fee933f2ef50c8 Mon Sep 17 00:00:00 2001 From: gitbot <gitbot@garz-fricke.com> Date: Mon, 20 Jun 2022 18:18:29 +0000 Subject: [PATCH] Integrate gitlab-ci/define-yamllint-explicitly -- Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/2b2bc22010347ad46361e2d781a3d8ff745a1710 Define yamllint job explicitly in each pipeline The yamllint job was included in the pipeline implicitly via the inclusion of common.yml. This is not very transparent. Make the common definition a base job and extend it explicitly in each pipeline now. Add infrastructure stage comment header into both yaml files. --- .gitlab-ci | 2 +- .gitlab-ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci b/.gitlab-ci index 686323c6..2b2bc220 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit 686323c648881a4fa0f3f8ae6e305d17337eecf3 +Subproject commit 2b2bc22010347ad46361e2d781a3d8ff745a1710 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50cd1ec1..2f708320 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,14 +4,14 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: 686323c648881a4fa0f3f8ae6e305d17337eecf3 + ref: 2b2bc22010347ad46361e2d781a3d8ff745a1710 file: 'manifest.yml' variables: MANIFEST_PROJECT_ID: 1725 MASTER_BRANCH_MANIFEST: kirkstone MASTER_BRANCH_PROJECT: kirkstone - GITLAB_CI_CURRENT_REV: 686323c648881a4fa0f3f8ae6e305d17337eecf3 + GITLAB_CI_CURRENT_REV: 2b2bc22010347ad46361e2d781a3d8ff745a1710 CI_PARAM_IMAGE: seconorth-image CI_PARAM_DISTRO: seconorth-wayland CI_PARAM_IMAGE_FNG: fngsystem-image -- GitLab