From fac60c140ba57ceebbdcd5278812fe4fa9f737df Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 26 Oct 2023 17:36:30 +0100 Subject: [PATCH] ci: don't run sanity in Marge pipelines This check is intended for the MR author; for everyone else, there's nothing they can do if the job fails so it's pointless to run it. Part-of: --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d63be7d3770..99163b3e155 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -146,6 +146,8 @@ include: - &is-pre-merge '$CI_PIPELINE_SOURCE == "merge_request_event"' # Pre-merge pipeline for Marge Bot - &is-pre-merge-for-marge '$GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"' + # Pre-merge pipeline *not* for Marge Bot + - &is-pre-merge-not-for-marge '$GITLAB_USER_LOGIN != "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"' .container+build-rules: @@ -233,7 +235,7 @@ sanity: - .fdo.ci-fairy stage: sanity rules: - - if: *is-pre-merge + - if: *is-pre-merge-not-for-marge when: on_success # Other cases default to never variables: