From 231a5a01502f5e5dc2c9846b3f41418b3bd2a72f Mon Sep 17 00:00:00 2001
From: gitbot <gitbot@garz-fricke.com>
Date: Tue, 3 Jan 2023 16:56:56 +0000
Subject: [PATCH] Integrate gitlab-ci/add-job-to-cancel-outdated-pipelines and
1 more
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/ea1f3badfbab2167640774e38310c9251ada488b
cancel_pipelines: include downstream pipelines
--
Commit: https://git.seco.com/seco-ne/yocto/infrastructure/gitlab-ci/-/commit/c8f97623cad52bb485791e0b0096f8fdcf44eaad
Add job to cancel outdated pipelines in merge requests
Everytime we push a new commit to a branch, a new pipeline is created.
Often the pipeline for the previous commit has not finished yet, and
GitLab does not automatically cancel it. It consumes valuable build
time, even if we don't need the results anymore.
Adding a MR pipeline job to search for previous pipelines on the same
branch and cancel them explicitly.
---
.gitlab-ci | 2 +-
.gitlab-ci.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci b/.gitlab-ci
index bab6f81..ea1f3ba 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit bab6f8116ca81f562eef7d878bec5992953c4276
+Subproject commit ea1f3badfbab2167640774e38310c9251ada488b
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8af2d76..4b1d689 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,11 +4,11 @@
# ---------------------------------------------------------------------------------------
include:
- project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
- ref: bab6f8116ca81f562eef7d878bec5992953c4276
+ ref: ea1f3badfbab2167640774e38310c9251ada488b
file: 'manifest-integration.yml'
variables:
- GITLAB_CI_REVISION: bab6f8116ca81f562eef7d878bec5992953c4276
+ GITLAB_CI_REVISION: ea1f3badfbab2167640774e38310c9251ada488b
BB_RECIPE_NAME: qt-multi-screen-compositor
# FIXME: This is only necessary due to the following GitLab limitation:
# https://gitlab.com/gitlab-org/gitlab/-/issues/209904
--
GitLab