diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e27d03b5cb1..dbf235dd814 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -148,8 +148,6 @@ 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"' .never-post-merge-rules: @@ -247,7 +245,7 @@ sanity: - .fdo.ci-fairy stage: sanity rules: - - if: *is-pre-merge-not-for-marge + - if: *is-pre-merge when: on_success # Other cases default to never variables: