From d7ff93bb326d99fe17475925d046879c01afe235 Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Fri, 7 Jun 2024 11:53:12 +0200 Subject: [PATCH 1/4] CIAO: rename "marge-bot pipelines" to "final pipelines" We always runs one final, rebased pipeline before merging an MR to master (backport MRs are not concerned with this). This is currently handled by marge-bot. If we switch to merge trains, then GitLab does this for us when an MR is added to the train. There are some special rules we want to apply only in final pipelines. In practice, this only concerns: - the trigger job, which mustn't be manual on final pipelines; - opam jobs, of which we run more one final pipelines; - the coverage report job, which is disabled on final pipelines as there is no point in collating a coverage report for an MR that will be merged. Throughout the CI configuration code, we've referred to these final pipelines as "marge-bot pipelines". To adapt to the potential switch to merge trains, we're renaming such pipelines to "final pipelines". --- .gitlab/ci/pipelines/before_merging.yml | 252 ++++++++++++------ .../ci/pipelines/schedule_extended_test.yml | 246 +++++++++++------ ci/bin/code_verification.ml | 6 +- ci/bin/rules.ml | 2 + ci/bin/rules.mli | 14 +- 5 files changed, 347 insertions(+), 173 deletions(-) diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index 9f9a4c7dd7ef..aa35eb47181b 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -92,7 +92,8 @@ trigger: tags: - gcp rules: - - if: $CI_MERGE_REQUEST_ASSIGNEES !~ /nomadic-margebot/ + - if: $GITLAB_USER_LOGIN != "nomadic-margebot" && $CI_MERGE_REQUEST_ASSIGNEES !~ + /nomadic-margebot/ when: manual allow_failure: false - when: always @@ -624,7 +625,8 @@ opam:bls12-381: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 7 minutes needs: @@ -828,7 +830,8 @@ opam:octez-alcotezt: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 7 minutes needs: @@ -1168,7 +1171,8 @@ opam:octez-crawler: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -1440,7 +1444,8 @@ opam:octez-distributed-internal: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 7 minutes needs: @@ -1508,7 +1513,8 @@ opam:octez-distributed-lwt-internal: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 7 minutes needs: @@ -1644,7 +1650,8 @@ opam:octez-evm-node-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 1 minute needs: @@ -1712,7 +1719,8 @@ opam:octez-injector: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -1780,7 +1788,8 @@ opam:octez-internal-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 7 minutes needs: @@ -1848,7 +1857,8 @@ opam:octez-l2-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -1916,7 +1926,8 @@ opam:octez-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 7 minutes needs: @@ -2052,7 +2063,8 @@ opam:octez-node-config: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -2120,7 +2132,8 @@ opam:octez-proto-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -2188,7 +2201,8 @@ opam:octez-protocol-000-Ps9mPmXa-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -2256,7 +2270,8 @@ opam:octez-protocol-001-PtCJ7pwo-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -2324,7 +2339,8 @@ opam:octez-protocol-002-PsYLVpVv-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -2392,7 +2408,8 @@ opam:octez-protocol-003-PsddFKi3-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -2460,7 +2477,8 @@ opam:octez-protocol-004-Pt24m4xi-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -2528,7 +2546,8 @@ opam:octez-protocol-005-PsBabyM1-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -2596,7 +2615,8 @@ opam:octez-protocol-006-PsCARTHA-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -2664,7 +2684,8 @@ opam:octez-protocol-007-PsDELPH1-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -2732,7 +2753,8 @@ opam:octez-protocol-008-PtEdo2Zk-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -2800,7 +2822,8 @@ opam:octez-protocol-009-PsFLoren-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -2868,7 +2891,8 @@ opam:octez-protocol-010-PtGRANAD-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -2936,7 +2960,8 @@ opam:octez-protocol-011-PtHangz2-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -3004,7 +3029,8 @@ opam:octez-protocol-012-Psithaca-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -3072,7 +3098,8 @@ opam:octez-protocol-013-PtJakart-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -3140,7 +3167,8 @@ opam:octez-protocol-014-PtKathma-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -3208,7 +3236,8 @@ opam:octez-protocol-015-PtLimaPt-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -3276,7 +3305,8 @@ opam:octez-protocol-016-PtMumbai-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -3344,7 +3374,8 @@ opam:octez-protocol-017-PtNairob-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -3412,7 +3443,8 @@ opam:octez-protocol-018-Proxford-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -3480,7 +3512,8 @@ opam:octez-protocol-019-PtParisB-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -3548,7 +3581,8 @@ opam:octez-protocol-alpha-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -3752,7 +3786,8 @@ opam:octez-riscv-api: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 7 minutes needs: @@ -3820,7 +3855,8 @@ opam:octez-riscv-pvm: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -3888,7 +3924,8 @@ opam:octez-rpc-process: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -3956,7 +3993,8 @@ opam:octez-rust-deps: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 7 minutes needs: @@ -4024,7 +4062,8 @@ opam:octez-shell-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -4228,7 +4267,8 @@ opam:octez-smart-rollup-node-Proxford: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -4296,7 +4336,8 @@ opam:octez-smart-rollup-node-PtNairob: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -4364,7 +4405,8 @@ opam:octez-smart-rollup-node-PtParisB: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -4432,7 +4474,8 @@ opam:octez-smart-rollup-node-alpha: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -4500,7 +4543,8 @@ opam:octez-smart-rollup-node-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -4636,7 +4680,8 @@ opam:octez-smart-rollup-wasm-debugger-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -4704,7 +4749,8 @@ opam:octez-smart-rollup-wasm-debugger-plugin: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 7 minutes needs: @@ -4840,7 +4886,8 @@ opam:tezos-benchmark: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -4908,7 +4955,8 @@ opam:tezos-client-demo-counter: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -4976,7 +5024,8 @@ opam:tezos-client-genesis: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -5044,7 +5093,8 @@ opam:tezos-dac-client-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -5112,7 +5162,8 @@ opam:tezos-dac-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -5180,7 +5231,8 @@ opam:tezos-dac-node-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -5248,7 +5300,8 @@ opam:tezos-dal-node-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -5316,7 +5369,8 @@ opam:tezos-dal-node-services: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -5384,7 +5438,8 @@ opam:tezos-openapi: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -5452,7 +5507,8 @@ opam:tezos-protocol-000-Ps9mPmXa: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -5520,7 +5576,8 @@ opam:tezos-protocol-001-PtCJ7pwo: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -5588,7 +5645,8 @@ opam:tezos-protocol-002-PsYLVpVv: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -5656,7 +5714,8 @@ opam:tezos-protocol-003-PsddFKi3: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -5724,7 +5783,8 @@ opam:tezos-protocol-004-Pt24m4xi: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -5792,7 +5852,8 @@ opam:tezos-protocol-005-PsBABY5H: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -5860,7 +5921,8 @@ opam:tezos-protocol-005-PsBabyM1: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -5928,7 +5990,8 @@ opam:tezos-protocol-006-PsCARTHA: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -5996,7 +6059,8 @@ opam:tezos-protocol-007-PsDELPH1: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6064,7 +6128,8 @@ opam:tezos-protocol-008-PtEdo2Zk: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6132,7 +6197,8 @@ opam:tezos-protocol-008-PtEdoTez: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6200,7 +6266,8 @@ opam:tezos-protocol-009-PsFLoren: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6268,7 +6335,8 @@ opam:tezos-protocol-010-PtGRANAD: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6336,7 +6404,8 @@ opam:tezos-protocol-011-PtHangz2: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6404,7 +6473,8 @@ opam:tezos-protocol-012-Psithaca: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6472,7 +6542,8 @@ opam:tezos-protocol-013-PtJakart: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6540,7 +6611,8 @@ opam:tezos-protocol-014-PtKathma: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6608,7 +6680,8 @@ opam:tezos-protocol-015-PtLimaPt: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6676,7 +6749,8 @@ opam:tezos-protocol-016-PtMumbai: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6744,7 +6818,8 @@ opam:tezos-protocol-017-PtNairob: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6812,7 +6887,8 @@ opam:tezos-protocol-018-Proxford: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6880,7 +6956,8 @@ opam:tezos-protocol-019-PtParisB: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6948,7 +7025,8 @@ opam:tezos-protocol-alpha: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -7016,7 +7094,8 @@ opam:tezos-protocol-demo-counter: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -7084,7 +7163,8 @@ opam:tezos-protocol-demo-noops: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -7152,7 +7232,8 @@ opam:tezos-protocol-genesis: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -7220,7 +7301,8 @@ opam:tezos-proxy-server-config: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -7288,7 +7370,8 @@ opam:tezt-tezos: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -8920,7 +9003,8 @@ oc.unified_coverage: tags: - gcp rules: - - if: $GITLAB_USER_LOGIN == "nomadic-margebot" + - if: $GITLAB_USER_LOGIN == "nomadic-margebot" || $CI_MERGE_REQUEST_ASSIGNEES =~ + /nomadic-margebot/ when: never - changes: - .gitlab-ci.yml diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index cc55b7996372..e99ec1b5eee6 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -573,7 +573,8 @@ opam:bls12-381: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 7 minutes needs: @@ -777,7 +778,8 @@ opam:octez-alcotezt: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 7 minutes needs: @@ -1117,7 +1119,8 @@ opam:octez-crawler: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -1389,7 +1392,8 @@ opam:octez-distributed-internal: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 7 minutes needs: @@ -1457,7 +1461,8 @@ opam:octez-distributed-lwt-internal: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 7 minutes needs: @@ -1593,7 +1598,8 @@ opam:octez-evm-node-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 1 minute needs: @@ -1661,7 +1667,8 @@ opam:octez-injector: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -1729,7 +1736,8 @@ opam:octez-internal-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 7 minutes needs: @@ -1797,7 +1805,8 @@ opam:octez-l2-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -1865,7 +1874,8 @@ opam:octez-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 7 minutes needs: @@ -2001,7 +2011,8 @@ opam:octez-node-config: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -2069,7 +2080,8 @@ opam:octez-proto-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -2137,7 +2149,8 @@ opam:octez-protocol-000-Ps9mPmXa-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -2205,7 +2218,8 @@ opam:octez-protocol-001-PtCJ7pwo-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -2273,7 +2287,8 @@ opam:octez-protocol-002-PsYLVpVv-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -2341,7 +2356,8 @@ opam:octez-protocol-003-PsddFKi3-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -2409,7 +2425,8 @@ opam:octez-protocol-004-Pt24m4xi-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -2477,7 +2494,8 @@ opam:octez-protocol-005-PsBabyM1-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -2545,7 +2563,8 @@ opam:octez-protocol-006-PsCARTHA-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -2613,7 +2632,8 @@ opam:octez-protocol-007-PsDELPH1-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -2681,7 +2701,8 @@ opam:octez-protocol-008-PtEdo2Zk-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -2749,7 +2770,8 @@ opam:octez-protocol-009-PsFLoren-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -2817,7 +2839,8 @@ opam:octez-protocol-010-PtGRANAD-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -2885,7 +2908,8 @@ opam:octez-protocol-011-PtHangz2-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -2953,7 +2977,8 @@ opam:octez-protocol-012-Psithaca-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -3021,7 +3046,8 @@ opam:octez-protocol-013-PtJakart-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -3089,7 +3115,8 @@ opam:octez-protocol-014-PtKathma-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -3157,7 +3184,8 @@ opam:octez-protocol-015-PtLimaPt-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -3225,7 +3253,8 @@ opam:octez-protocol-016-PtMumbai-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -3293,7 +3322,8 @@ opam:octez-protocol-017-PtNairob-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -3361,7 +3391,8 @@ opam:octez-protocol-018-Proxford-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -3429,7 +3460,8 @@ opam:octez-protocol-019-PtParisB-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -3497,7 +3529,8 @@ opam:octez-protocol-alpha-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -3701,7 +3734,8 @@ opam:octez-riscv-api: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 7 minutes needs: @@ -3769,7 +3803,8 @@ opam:octez-riscv-pvm: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -3837,7 +3872,8 @@ opam:octez-rpc-process: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 3 minutes needs: @@ -3905,7 +3941,8 @@ opam:octez-rust-deps: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 7 minutes needs: @@ -3973,7 +4010,8 @@ opam:octez-shell-libs: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -4177,7 +4215,8 @@ opam:octez-smart-rollup-node-Proxford: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -4245,7 +4284,8 @@ opam:octez-smart-rollup-node-PtNairob: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -4313,7 +4353,8 @@ opam:octez-smart-rollup-node-PtParisB: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -4381,7 +4422,8 @@ opam:octez-smart-rollup-node-alpha: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -4449,7 +4491,8 @@ opam:octez-smart-rollup-node-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -4585,7 +4628,8 @@ opam:octez-smart-rollup-wasm-debugger-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -4653,7 +4697,8 @@ opam:octez-smart-rollup-wasm-debugger-plugin: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 7 minutes needs: @@ -4789,7 +4834,8 @@ opam:tezos-benchmark: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -4857,7 +4903,8 @@ opam:tezos-client-demo-counter: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -4925,7 +4972,8 @@ opam:tezos-client-genesis: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -4993,7 +5041,8 @@ opam:tezos-dac-client-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -5061,7 +5110,8 @@ opam:tezos-dac-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -5129,7 +5179,8 @@ opam:tezos-dac-node-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 2 minutes needs: @@ -5197,7 +5248,8 @@ opam:tezos-dal-node-lib: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -5265,7 +5317,8 @@ opam:tezos-dal-node-services: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -5333,7 +5386,8 @@ opam:tezos-openapi: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -5401,7 +5455,8 @@ opam:tezos-protocol-000-Ps9mPmXa: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -5469,7 +5524,8 @@ opam:tezos-protocol-001-PtCJ7pwo: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -5537,7 +5593,8 @@ opam:tezos-protocol-002-PsYLVpVv: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -5605,7 +5662,8 @@ opam:tezos-protocol-003-PsddFKi3: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -5673,7 +5731,8 @@ opam:tezos-protocol-004-Pt24m4xi: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -5741,7 +5800,8 @@ opam:tezos-protocol-005-PsBABY5H: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -5809,7 +5869,8 @@ opam:tezos-protocol-005-PsBabyM1: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 4 minutes needs: @@ -5877,7 +5938,8 @@ opam:tezos-protocol-006-PsCARTHA: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -5945,7 +6007,8 @@ opam:tezos-protocol-007-PsDELPH1: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6013,7 +6076,8 @@ opam:tezos-protocol-008-PtEdo2Zk: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6081,7 +6145,8 @@ opam:tezos-protocol-008-PtEdoTez: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6149,7 +6214,8 @@ opam:tezos-protocol-009-PsFLoren: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6217,7 +6283,8 @@ opam:tezos-protocol-010-PtGRANAD: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6285,7 +6352,8 @@ opam:tezos-protocol-011-PtHangz2: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6353,7 +6421,8 @@ opam:tezos-protocol-012-Psithaca: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6421,7 +6490,8 @@ opam:tezos-protocol-013-PtJakart: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6489,7 +6559,8 @@ opam:tezos-protocol-014-PtKathma: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6557,7 +6628,8 @@ opam:tezos-protocol-015-PtLimaPt: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6625,7 +6697,8 @@ opam:tezos-protocol-016-PtMumbai: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6693,7 +6766,8 @@ opam:tezos-protocol-017-PtNairob: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6761,7 +6835,8 @@ opam:tezos-protocol-018-Proxford: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6829,7 +6904,8 @@ opam:tezos-protocol-019-PtParisB: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 5 minutes needs: @@ -6897,7 +6973,8 @@ opam:tezos-protocol-alpha: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -6965,7 +7042,8 @@ opam:tezos-protocol-demo-counter: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -7033,7 +7111,8 @@ opam:tezos-protocol-demo-noops: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -7101,7 +7180,8 @@ opam:tezos-protocol-genesis: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -7169,7 +7249,8 @@ opam:tezos-proxy-server-config: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: @@ -7237,7 +7318,8 @@ opam:tezt-tezos: - manifest/**/*.ml* - scripts/opam-prepare-repo.sh - scripts/version.sh - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $GITLAB_USER_LOGIN == "nomadic-margebot" + if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) when: delayed start_in: 6 minutes needs: diff --git a/ci/bin/code_verification.ml b/ci/bin/code_verification.ml index 21d1d8e1b8a5..168acaff0e0a 100644 --- a/ci/bin/code_verification.ml +++ b/ci/bin/code_verification.ml @@ -66,7 +66,7 @@ let opam_rules ~only_marge_bot ?batch_index () = job_rule ~if_: (if only_marge_bot then - If.(Rules.merge_request && Rules.started_by_marge_bot) + If.(Rules.merge_request && Rules.is_final_pipeline) else Rules.merge_request) ~changes:(Changeset.encode changeset_opam_jobs) ~when_ @@ -334,7 +334,7 @@ let jobs pipeline_type = | Before_merging -> ( (* MR labels can be used to force tests to run. *) (if margebot_disable then - [job_rule ~if_:Rules.started_by_marge_bot ~when_:Never ()] + [job_rule ~if_:Rules.is_final_pipeline ~when_:Never ()] else []) @ (match label with | Some label -> @@ -398,7 +398,7 @@ let jobs pipeline_type = ~rules: [ job_rule - ~if_:(If.not Rules.assigned_to_marge_bot) + ~if_:(If.not Rules.is_final_pipeline) ~allow_failure:No ~when_:Manual (); diff --git a/ci/bin/rules.ml b/ci/bin/rules.ml index 4f9dc2b4fc5f..4588fb5815e1 100644 --- a/ci/bin/rules.ml +++ b/ci/bin/rules.ml @@ -46,6 +46,8 @@ let assigned_to_marge_bot = let started_by_marge_bot = Predefined_vars.gitlab_user_login == str "nomadic-margebot" +let is_final_pipeline = started_by_marge_bot || assigned_to_marge_bot + let has_mr_label label = Predefined_vars.ci_merge_request_labels =~ "/(?:^|,)" ^ label ^ "(?:$|,)/" diff --git a/ci/bin/rules.mli b/ci/bin/rules.mli index f1c418764612..ccaa5000e7f3 100644 --- a/ci/bin/rules.mli +++ b/ci/bin/rules.mli @@ -46,11 +46,17 @@ val has_tag_match : string -> If.t (** A rule that is true if the comma-separated list [CI_MERGE_REQUEST_LABELS] contains a given label. *) val has_mr_label : string -> If.t -(** A rule that is true if [CI_MERGE_REQUEST_ASSIGNEES] contains [nomadic-margebot]. *) -val assigned_to_marge_bot : If.t +(** A rule that is true if this is a final pipeline before merging. -(** A rule that is true if [CI_USER_LOGIN] equals [nomadic-margebot]. *) -val started_by_marge_bot : If.t + This rule is true if and only if: + - the pipeline is started by marge-bot; or + - the merge request is assigned to marge-bot. + + We require the second case since there are cases where marge-bot + will just trigger an existing pipeline instead of creating one. + + Use this rule to add or exclude jobs from final pipelines. *) +val is_final_pipeline : If.t (** A rule that is never true. *) val never : If.t -- GitLab From 3b75a8a0d9b36bfe58763bf093043428772d0250 Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Fri, 7 Jun 2024 11:54:30 +0200 Subject: [PATCH 2/4] CIAO: remove mentions of marge in client code, call final pipeline --- ci/bin/code_verification.ml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/ci/bin/code_verification.ml b/ci/bin/code_verification.ml index 168acaff0e0a..893b0640b73c 100644 --- a/ci/bin/code_verification.ml +++ b/ci/bin/code_verification.ml @@ -54,7 +54,7 @@ type opam_package = { batch_index : int; } -let opam_rules ~only_marge_bot ?batch_index () = +let opam_rules ~only_final_pipeline ?batch_index () = let when_ = match batch_index with | Some batch_index -> Delayed (Minutes batch_index) @@ -65,7 +65,7 @@ let opam_rules ~only_marge_bot ?batch_index () = job_rule ~if_:(Rules.has_mr_label "ci--opam") ~when_ (); job_rule ~if_: - (if only_marge_bot then + (if only_final_pipeline then If.(Rules.merge_request && Rules.is_final_pipeline) else Rules.merge_request) ~changes:(Changeset.encode changeset_opam_jobs) @@ -86,7 +86,7 @@ let job_opam_package ?dependencies {name; group; batch_index} : tezos_job = Therefore, a retry was added. This should be removed once the underlying tests have been fixed. *) ~retry:2 - ~rules:(opam_rules ~only_marge_bot:(group = All) ~batch_index ()) + ~rules:(opam_rules ~only_final_pipeline:(group = All) ~batch_index ()) ~variables: [ (* See [.gitlab-ci.yml] for details on [RUNTEZTALIAS] *) @@ -321,10 +321,10 @@ let jobs pipeline_type = enable the job [On_success] in the [before_merging] pipeline. This is safe, but prefer specifying a [changes] clause if possible. - If [margebot_disable] is set to true (default false), this job is - disabled when marge-bot starts the [before_merging] pipeline. *) + If [final_pipeline_disable] is set to true (default false), this job is + disabled in final [Before_merging] pipelines. *) let make_rules ?label ?changes ?(manual = No) ?(dependent = false) - ?(margebot_disable = false) () = + ?(final_pipeline_disable = false) () = match pipeline_type with | Schedule_extended_test -> (* The scheduled pipeline always runs all jobs unconditionally @@ -333,7 +333,7 @@ let jobs pipeline_type = [job_rule ~when_:(if dependent then On_success else Always) ()] | Before_merging -> ( (* MR labels can be used to force tests to run. *) - (if margebot_disable then + (if final_pipeline_disable then [job_rule ~if_:Rules.is_final_pipeline ~when_:Never ()] else []) @ (match label with @@ -710,7 +710,7 @@ let jobs pipeline_type = ~dependencies:dependencies_needs_start ~before_script:(before_script ~eval_opam:true []) ~artifacts:(artifacts ["_opam-repo-for-release/"]) - ~rules:(opam_rules ~only_marge_bot:false ~batch_index:1 ()) + ~rules:(opam_rules ~only_final_pipeline:false ~batch_index:1 ()) [ "git init _opam-repo-for-release"; "./scripts/opam-prepare-repo.sh dev ./ ./_opam-repo-for-release"; @@ -1605,7 +1605,10 @@ let jobs pipeline_type = ~stage:Stages.test_coverage ~coverage:"/Coverage: ([^%]+%)/" ~rules: - (make_rules ~margebot_disable:true ~changes:changeset_octez ()) + (make_rules + ~final_pipeline_disable:true + ~changes:changeset_octez + ()) ~variables: [ (* This inhibits the Makefile's opam version check, which -- GitLab From b7d067a447837bb923fff03f9d5127cc69a064ed Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Fri, 31 May 2024 16:50:44 +0200 Subject: [PATCH 3/4] CIAO: Add rules for [CI_MERGE_REQUEST_EVENT_TYPE] This predefined GitLab CI variable allows to distinguish different types of merge request pipelines. --- ci/bin/rules.ml | 19 +++++++++++++++++++ ci/bin/rules.mli | 23 +++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/ci/bin/rules.ml b/ci/bin/rules.ml index 4588fb5815e1..2d7338b2118d 100644 --- a/ci/bin/rules.ml +++ b/ci/bin/rules.ml @@ -8,6 +8,25 @@ open Gitlab_ci open Gitlab_ci.If +(** Types of merge request pipelines. *) +type merge_request_event_type = Detached | Merged_result | Merge_train + +(** Convert a {!pipeline_source} to string. *) +let merge_request_event_type_to_string = function + | Detached -> "detached" + | Merged_result -> "merged_result" + | Merge_train -> "merge_train" + +let merge_request_event_type_eq merge_request_event_type = + Predefined_vars.ci_merge_request_event_type + == str (merge_request_event_type_to_string merge_request_event_type) + +let detached = merge_request_event_type_eq Detached + +let merged_result = merge_request_event_type_eq Merged_result + +let merge_train = merge_request_event_type_eq Merge_train + (** The source of a pipeline. *) type pipeline_source = Schedule | Merge_request_event | Push diff --git a/ci/bin/rules.mli b/ci/bin/rules.mli index ccaa5000e7f3..f4a9a7ffdcf4 100644 --- a/ci/bin/rules.mli +++ b/ci/bin/rules.mli @@ -22,6 +22,29 @@ val push : If.t (** A rule that is true if [CI_PIPELINE_SOURCE] is [scheduled]. *) val scheduled : If.t +(** A rule that is true if [CI_MERGE_REQUEST_EVENT_TYPE] is [detached]. + + Merge request pipelines are {i detached} when: + - merge result pipelines are disabled in GitLab CI settings; + - merge result pipelines are enabled {i but} the MR has + conflicts with the target branch and cannot be rebased. *) +val detached : If.t + +(** A rule that is true if [CI_MERGE_REQUEST_EVENT_TYPE] is [merged_result]. + + Merge request pipelines are {i merged result} pipelines when: + - merge result pipelines are enabled in GitLab CI settings; {b and} + - MR rebases cleanly on the target branch; {b and} + - the pipeline is not running in a merge train. *) +val merged_result : If.t + +(** A rule that is true if [CI_MERGE_REQUEST_EVENT_TYPE] is [merge_train]. + + Merge request pipelines are {i merge train} pipelines when merge + trains are activated (and thus necessarily merged result + pipelines), and when the pipeline is triggered from a merge train. *) +val merge_train : If.t + (** A rule that is true for scheduled extended test pipelines. Such pipelines have [CI_PIPELINE_SOURCE] set to [scheduled] and -- GitLab From 54938e84d0dda9eeecb214337f57baba31000f41 Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Fri, 31 May 2024 16:51:36 +0200 Subject: [PATCH 4/4] CIAO: merge train pipelines are also final pipelines Modifies the rule for [final_pipelines] such that merge train pipelines are also regarded as final pipelines. The consequence is all the special behavior reserved for final pipelines: automatic trigger, more opam jobs, no coverage report, is also applied to pipelines started by merge trains. --- .gitlab/ci/pipelines/before_merging.yml | 250 ++++++++++++------ .../ci/pipelines/schedule_extended_test.yml | 246 +++++++++++------ ci/bin/rules.ml | 3 +- ci/bin/rules.mli | 3 +- 4 files changed, 334 insertions(+), 168 deletions(-) diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index aa35eb47181b..9a649f65dbd2 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -93,7 +93,7 @@ trigger: - gcp rules: - if: $GITLAB_USER_LOGIN != "nomadic-margebot" && $CI_MERGE_REQUEST_ASSIGNEES !~ - /nomadic-margebot/ + /nomadic-margebot/ && $CI_MERGE_REQUEST_EVENT_TYPE != "merge_train" when: manual allow_failure: false - when: always @@ -626,7 +626,8 @@ opam:bls12-381: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -831,7 +832,8 @@ opam:octez-alcotezt: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -1172,7 +1174,8 @@ opam:octez-crawler: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -1445,7 +1448,8 @@ opam:octez-distributed-internal: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -1514,7 +1518,8 @@ opam:octez-distributed-lwt-internal: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -1651,7 +1656,8 @@ opam:octez-evm-node-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 1 minute needs: @@ -1720,7 +1726,8 @@ opam:octez-injector: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -1789,7 +1796,8 @@ opam:octez-internal-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -1858,7 +1866,8 @@ opam:octez-l2-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -1927,7 +1936,8 @@ opam:octez-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -2064,7 +2074,8 @@ opam:octez-node-config: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -2133,7 +2144,8 @@ opam:octez-proto-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -2202,7 +2214,8 @@ opam:octez-protocol-000-Ps9mPmXa-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -2271,7 +2284,8 @@ opam:octez-protocol-001-PtCJ7pwo-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -2340,7 +2354,8 @@ opam:octez-protocol-002-PsYLVpVv-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2409,7 +2424,8 @@ opam:octez-protocol-003-PsddFKi3-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2478,7 +2494,8 @@ opam:octez-protocol-004-Pt24m4xi-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2547,7 +2564,8 @@ opam:octez-protocol-005-PsBabyM1-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2616,7 +2634,8 @@ opam:octez-protocol-006-PsCARTHA-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2685,7 +2704,8 @@ opam:octez-protocol-007-PsDELPH1-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2754,7 +2774,8 @@ opam:octez-protocol-008-PtEdo2Zk-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2823,7 +2844,8 @@ opam:octez-protocol-009-PsFLoren-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2892,7 +2914,8 @@ opam:octez-protocol-010-PtGRANAD-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2961,7 +2984,8 @@ opam:octez-protocol-011-PtHangz2-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -3030,7 +3054,8 @@ opam:octez-protocol-012-Psithaca-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -3099,7 +3124,8 @@ opam:octez-protocol-013-PtJakart-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -3168,7 +3194,8 @@ opam:octez-protocol-014-PtKathma-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -3237,7 +3264,8 @@ opam:octez-protocol-015-PtLimaPt-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -3306,7 +3334,8 @@ opam:octez-protocol-016-PtMumbai-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -3375,7 +3404,8 @@ opam:octez-protocol-017-PtNairob-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -3444,7 +3474,8 @@ opam:octez-protocol-018-Proxford-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -3513,7 +3544,8 @@ opam:octez-protocol-019-PtParisB-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -3582,7 +3614,8 @@ opam:octez-protocol-alpha-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -3787,7 +3820,8 @@ opam:octez-riscv-api: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -3856,7 +3890,8 @@ opam:octez-riscv-pvm: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -3925,7 +3960,8 @@ opam:octez-rpc-process: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -3994,7 +4030,8 @@ opam:octez-rust-deps: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -4063,7 +4100,8 @@ opam:octez-shell-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -4268,7 +4306,8 @@ opam:octez-smart-rollup-node-Proxford: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4337,7 +4376,8 @@ opam:octez-smart-rollup-node-PtNairob: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4406,7 +4446,8 @@ opam:octez-smart-rollup-node-PtParisB: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4475,7 +4516,8 @@ opam:octez-smart-rollup-node-alpha: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4544,7 +4586,8 @@ opam:octez-smart-rollup-node-lib: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4681,7 +4724,8 @@ opam:octez-smart-rollup-wasm-debugger-lib: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4750,7 +4794,8 @@ opam:octez-smart-rollup-wasm-debugger-plugin: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -4887,7 +4932,8 @@ opam:tezos-benchmark: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -4956,7 +5002,8 @@ opam:tezos-client-demo-counter: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5025,7 +5072,8 @@ opam:tezos-client-genesis: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5094,7 +5142,8 @@ opam:tezos-dac-client-lib: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5163,7 +5212,8 @@ opam:tezos-dac-lib: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5232,7 +5282,8 @@ opam:tezos-dac-node-lib: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -5301,7 +5352,8 @@ opam:tezos-dal-node-lib: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5370,7 +5422,8 @@ opam:tezos-dal-node-services: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -5439,7 +5492,8 @@ opam:tezos-openapi: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -5508,7 +5562,8 @@ opam:tezos-protocol-000-Ps9mPmXa: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5577,7 +5632,8 @@ opam:tezos-protocol-001-PtCJ7pwo: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5646,7 +5702,8 @@ opam:tezos-protocol-002-PsYLVpVv: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5715,7 +5772,8 @@ opam:tezos-protocol-003-PsddFKi3: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5784,7 +5842,8 @@ opam:tezos-protocol-004-Pt24m4xi: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5853,7 +5912,8 @@ opam:tezos-protocol-005-PsBABY5H: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5922,7 +5982,8 @@ opam:tezos-protocol-005-PsBabyM1: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5991,7 +6052,8 @@ opam:tezos-protocol-006-PsCARTHA: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6060,7 +6122,8 @@ opam:tezos-protocol-007-PsDELPH1: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6129,7 +6192,8 @@ opam:tezos-protocol-008-PtEdo2Zk: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6198,7 +6262,8 @@ opam:tezos-protocol-008-PtEdoTez: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6267,7 +6332,8 @@ opam:tezos-protocol-009-PsFLoren: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6336,7 +6402,8 @@ opam:tezos-protocol-010-PtGRANAD: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6405,7 +6472,8 @@ opam:tezos-protocol-011-PtHangz2: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6474,7 +6542,8 @@ opam:tezos-protocol-012-Psithaca: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6543,7 +6612,8 @@ opam:tezos-protocol-013-PtJakart: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6612,7 +6682,8 @@ opam:tezos-protocol-014-PtKathma: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6681,7 +6752,8 @@ opam:tezos-protocol-015-PtLimaPt: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6750,7 +6822,8 @@ opam:tezos-protocol-016-PtMumbai: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6819,7 +6892,8 @@ opam:tezos-protocol-017-PtNairob: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6888,7 +6962,8 @@ opam:tezos-protocol-018-Proxford: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6957,7 +7032,8 @@ opam:tezos-protocol-019-PtParisB: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -7026,7 +7102,8 @@ opam:tezos-protocol-alpha: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -7095,7 +7172,8 @@ opam:tezos-protocol-demo-counter: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -7164,7 +7242,8 @@ opam:tezos-protocol-demo-noops: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -7233,7 +7312,8 @@ opam:tezos-protocol-genesis: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -7302,7 +7382,8 @@ opam:tezos-proxy-server-config: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -7371,7 +7452,8 @@ opam:tezt-tezos: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -9004,7 +9086,7 @@ oc.unified_coverage: - gcp rules: - if: $GITLAB_USER_LOGIN == "nomadic-margebot" || $CI_MERGE_REQUEST_ASSIGNEES =~ - /nomadic-margebot/ + /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train" when: never - changes: - .gitlab-ci.yml diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index e99ec1b5eee6..3ebd3f5396fc 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -574,7 +574,8 @@ opam:bls12-381: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -779,7 +780,8 @@ opam:octez-alcotezt: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -1120,7 +1122,8 @@ opam:octez-crawler: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -1393,7 +1396,8 @@ opam:octez-distributed-internal: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -1462,7 +1466,8 @@ opam:octez-distributed-lwt-internal: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -1599,7 +1604,8 @@ opam:octez-evm-node-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 1 minute needs: @@ -1668,7 +1674,8 @@ opam:octez-injector: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -1737,7 +1744,8 @@ opam:octez-internal-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -1806,7 +1814,8 @@ opam:octez-l2-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -1875,7 +1884,8 @@ opam:octez-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -2012,7 +2022,8 @@ opam:octez-node-config: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -2081,7 +2092,8 @@ opam:octez-proto-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -2150,7 +2162,8 @@ opam:octez-protocol-000-Ps9mPmXa-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -2219,7 +2232,8 @@ opam:octez-protocol-001-PtCJ7pwo-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -2288,7 +2302,8 @@ opam:octez-protocol-002-PsYLVpVv-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2357,7 +2372,8 @@ opam:octez-protocol-003-PsddFKi3-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2426,7 +2442,8 @@ opam:octez-protocol-004-Pt24m4xi-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2495,7 +2512,8 @@ opam:octez-protocol-005-PsBabyM1-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2564,7 +2582,8 @@ opam:octez-protocol-006-PsCARTHA-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2633,7 +2652,8 @@ opam:octez-protocol-007-PsDELPH1-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2702,7 +2722,8 @@ opam:octez-protocol-008-PtEdo2Zk-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2771,7 +2792,8 @@ opam:octez-protocol-009-PsFLoren-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2840,7 +2862,8 @@ opam:octez-protocol-010-PtGRANAD-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2909,7 +2932,8 @@ opam:octez-protocol-011-PtHangz2-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -2978,7 +3002,8 @@ opam:octez-protocol-012-Psithaca-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -3047,7 +3072,8 @@ opam:octez-protocol-013-PtJakart-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -3116,7 +3142,8 @@ opam:octez-protocol-014-PtKathma-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -3185,7 +3212,8 @@ opam:octez-protocol-015-PtLimaPt-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -3254,7 +3282,8 @@ opam:octez-protocol-016-PtMumbai-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -3323,7 +3352,8 @@ opam:octez-protocol-017-PtNairob-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -3392,7 +3422,8 @@ opam:octez-protocol-018-Proxford-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -3461,7 +3492,8 @@ opam:octez-protocol-019-PtParisB-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -3530,7 +3562,8 @@ opam:octez-protocol-alpha-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -3735,7 +3768,8 @@ opam:octez-riscv-api: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -3804,7 +3838,8 @@ opam:octez-riscv-pvm: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -3873,7 +3908,8 @@ opam:octez-rpc-process: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 3 minutes needs: @@ -3942,7 +3978,8 @@ opam:octez-rust-deps: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -4011,7 +4048,8 @@ opam:octez-shell-libs: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -4216,7 +4254,8 @@ opam:octez-smart-rollup-node-Proxford: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4285,7 +4324,8 @@ opam:octez-smart-rollup-node-PtNairob: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4354,7 +4394,8 @@ opam:octez-smart-rollup-node-PtParisB: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4423,7 +4464,8 @@ opam:octez-smart-rollup-node-alpha: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4492,7 +4534,8 @@ opam:octez-smart-rollup-node-lib: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4629,7 +4672,8 @@ opam:octez-smart-rollup-wasm-debugger-lib: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -4698,7 +4742,8 @@ opam:octez-smart-rollup-wasm-debugger-plugin: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 7 minutes needs: @@ -4835,7 +4880,8 @@ opam:tezos-benchmark: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -4904,7 +4950,8 @@ opam:tezos-client-demo-counter: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -4973,7 +5020,8 @@ opam:tezos-client-genesis: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5042,7 +5090,8 @@ opam:tezos-dac-client-lib: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5111,7 +5160,8 @@ opam:tezos-dac-lib: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5180,7 +5230,8 @@ opam:tezos-dac-node-lib: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 2 minutes needs: @@ -5249,7 +5300,8 @@ opam:tezos-dal-node-lib: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5318,7 +5370,8 @@ opam:tezos-dal-node-services: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -5387,7 +5440,8 @@ opam:tezos-openapi: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -5456,7 +5510,8 @@ opam:tezos-protocol-000-Ps9mPmXa: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5525,7 +5580,8 @@ opam:tezos-protocol-001-PtCJ7pwo: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5594,7 +5650,8 @@ opam:tezos-protocol-002-PsYLVpVv: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5663,7 +5720,8 @@ opam:tezos-protocol-003-PsddFKi3: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5732,7 +5790,8 @@ opam:tezos-protocol-004-Pt24m4xi: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5801,7 +5860,8 @@ opam:tezos-protocol-005-PsBABY5H: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5870,7 +5930,8 @@ opam:tezos-protocol-005-PsBabyM1: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 4 minutes needs: @@ -5939,7 +6000,8 @@ opam:tezos-protocol-006-PsCARTHA: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6008,7 +6070,8 @@ opam:tezos-protocol-007-PsDELPH1: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6077,7 +6140,8 @@ opam:tezos-protocol-008-PtEdo2Zk: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6146,7 +6210,8 @@ opam:tezos-protocol-008-PtEdoTez: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6215,7 +6280,8 @@ opam:tezos-protocol-009-PsFLoren: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6284,7 +6350,8 @@ opam:tezos-protocol-010-PtGRANAD: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6353,7 +6420,8 @@ opam:tezos-protocol-011-PtHangz2: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6422,7 +6490,8 @@ opam:tezos-protocol-012-Psithaca: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6491,7 +6560,8 @@ opam:tezos-protocol-013-PtJakart: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6560,7 +6630,8 @@ opam:tezos-protocol-014-PtKathma: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6629,7 +6700,8 @@ opam:tezos-protocol-015-PtLimaPt: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6698,7 +6770,8 @@ opam:tezos-protocol-016-PtMumbai: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6767,7 +6840,8 @@ opam:tezos-protocol-017-PtNairob: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6836,7 +6910,8 @@ opam:tezos-protocol-018-Proxford: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6905,7 +6980,8 @@ opam:tezos-protocol-019-PtParisB: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 5 minutes needs: @@ -6974,7 +7050,8 @@ opam:tezos-protocol-alpha: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -7043,7 +7120,8 @@ opam:tezos-protocol-demo-counter: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -7112,7 +7190,8 @@ opam:tezos-protocol-demo-noops: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -7181,7 +7260,8 @@ opam:tezos-protocol-genesis: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -7250,7 +7330,8 @@ opam:tezos-proxy-server-config: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: @@ -7319,7 +7400,8 @@ opam:tezt-tezos: - scripts/opam-prepare-repo.sh - scripts/version.sh if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($GITLAB_USER_LOGIN == "nomadic-margebot" - || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/) + || $CI_MERGE_REQUEST_ASSIGNEES =~ /nomadic-margebot/ || $CI_MERGE_REQUEST_EVENT_TYPE + == "merge_train") when: delayed start_in: 6 minutes needs: diff --git a/ci/bin/rules.ml b/ci/bin/rules.ml index 2d7338b2118d..e14c0589eb5f 100644 --- a/ci/bin/rules.ml +++ b/ci/bin/rules.ml @@ -65,7 +65,8 @@ let assigned_to_marge_bot = let started_by_marge_bot = Predefined_vars.gitlab_user_login == str "nomadic-margebot" -let is_final_pipeline = started_by_marge_bot || assigned_to_marge_bot +let is_final_pipeline = + started_by_marge_bot || assigned_to_marge_bot || merge_train let has_mr_label label = Predefined_vars.ci_merge_request_labels =~ "/(?:^|,)" ^ label ^ "(?:$|,)/" diff --git a/ci/bin/rules.mli b/ci/bin/rules.mli index f4a9a7ffdcf4..91c212b1f1f1 100644 --- a/ci/bin/rules.mli +++ b/ci/bin/rules.mli @@ -73,7 +73,8 @@ val has_mr_label : string -> If.t This rule is true if and only if: - the pipeline is started by marge-bot; or - - the merge request is assigned to marge-bot. + - the merge request is assigned to marge-bot; or + - the pipeline is in a merge train. We require the second case since there are cases where marge-bot will just trigger an existing pipeline instead of creating one. -- GitLab