1- ---
21defaults :
32 actions :
43 update :
@@ -18,7 +17,6 @@ queue_rules:
1817 # only queue PRs that have completely been tested and reviewed
1918 queue_conditions :
2019 - and :
21- # requirements for any branch
2220 - label!=DNM
2321 - " #approved-reviews-by>=2"
2422 - " #changes-requested-reviews-by=0"
@@ -27,7 +25,6 @@ queue_rules:
2725 - " status-success=DCO"
2826 - or :
2927 - and :
30- # requirements for non ci/centos branches
3128 - base!=ci/centos
3229 - " status-success=codespell"
3330 - " status-success=go-test"
@@ -37,15 +34,11 @@ queue_rules:
3734 - " status-success=multi-arch-build"
3835 - " status-success=uncommitted-code-check"
3936 - or :
40- # dependabot has an invalid signed-off-by
4137 - author=dependabot[bot]
4238 - " status-success=commitlint"
43- # exclude the ci/centos branch from above status checks
4439 - base=ci/centos
4540 - or :
46- # requirenents per branch
4741 - and :
48- # ci/skip/e2e label has no meaning on ci/centos
4942 - base!=ci/centos
5043 - label=ci/skip/e2e
5144 - and :
@@ -88,11 +81,9 @@ queue_rules:
8881 - " status-success=ci/centos/upgrade-tests-cephfs"
8982 - " status-success=ci/centos/upgrade-tests-rbd"
9083 - and :
91- # requirements for ci/centos branch
9284 - base=ci/centos
9385 - " status-success=ci/centos/job-validation"
9486 - " status-success=ci/centos/jjb-validate"
95-
9687merge_queue :
9788 max_parallel_checks : 1
9889
@@ -104,12 +95,10 @@ pull_request_rules:
10495 - label!=conflicts
10596 - label!=ci/skip/e2e
10697 - label!=ci/in-progress/e2e
107- - not :
108- check-pending~=^ci/centos
109- - not :
110- status-success~=^ci/centos
98+ - not : check-pending~=^ci/centos
99+ - not : status-success~=^ci/centos
111100 - or :
112- - " check-pending=Queue: Embarked in merge queue "
101+ - queue-position >= 0
113102 - author=mergify[bot]
114103 actions :
115104 label :
0 commit comments