Skip to content

Commit af10721

Browse files
Madhu-1mergify[bot]
authored andcommitted
ci: update mergify rules
updating mergify rules to drop 3.11 and add 3.13 support. Signed-off-by: Madhu Rajanna <madhupr007@gmail.com> (cherry picked from commit b69c84b)
1 parent 2817b85 commit af10721

1 file changed

Lines changed: 27 additions & 36 deletions

File tree

.mergify.yml

Lines changed: 27 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,22 @@ queue_rules:
2525
- "status-success=ci/centos/upgrade-tests-cephfs"
2626
- "status-success=ci/centos/upgrade-tests-rbd"
2727
- and:
28-
- base=release-v3.11
28+
- base=release-v3.12
2929
- "status-success=codespell"
3030
- "status-success=multi-arch-build"
3131
- "status-success=go-test"
3232
- "status-success=golangci-lint"
3333
- "status-success=mod-check"
3434
- "status-success=lint-extras"
35-
- "status-success=ci/centos/k8s-e2e-external-storage/1.26"
36-
- "status-success=ci/centos/k8s-e2e-external-storage/1.27"
37-
- "status-success=ci/centos/k8s-e2e-external-storage/1.28"
3835
- "status-success=ci/centos/k8s-e2e-external-storage/1.29"
39-
- "status-success=ci/centos/mini-e2e-helm/k8s-1.26"
40-
- "status-success=ci/centos/mini-e2e-helm/k8s-1.27"
41-
- "status-success=ci/centos/mini-e2e-helm/k8s-1.28"
36+
- "status-success=ci/centos/k8s-e2e-external-storage/1.30"
37+
- "status-success=ci/centos/k8s-e2e-external-storage/1.31"
4238
- "status-success=ci/centos/mini-e2e-helm/k8s-1.29"
43-
- "status-success=ci/centos/mini-e2e/k8s-1.26"
44-
- "status-success=ci/centos/mini-e2e/k8s-1.27"
45-
- "status-success=ci/centos/mini-e2e/k8s-1.28"
39+
- "status-success=ci/centos/mini-e2e-helm/k8s-1.30"
40+
- "status-success=ci/centos/mini-e2e-helm/k8s-1.31"
4641
- "status-success=ci/centos/mini-e2e/k8s-1.29"
42+
- "status-success=ci/centos/mini-e2e/k8s-1.30"
43+
- "status-success=ci/centos/mini-e2e/k8s-1.31"
4744
- "status-success=ci/centos/upgrade-tests-cephfs"
4845
- "status-success=ci/centos/upgrade-tests-rbd"
4946
- and:
@@ -178,7 +175,7 @@ pull_request_rules:
178175
- "status-success=ci/centos/upgrade-tests-rbd"
179176
- and:
180177
- label!=DNM
181-
- base=release-v3.11
178+
- base=release-v3.12
182179
- "#approved-reviews-by>=2"
183180
- "#changes-requested-reviews-by=0"
184181
- "approved-reviews-by=@ceph/ceph-csi-contributors"
@@ -190,18 +187,15 @@ pull_request_rules:
190187
- "status-success=commitlint"
191188
- "status-success=mod-check"
192189
- "status-success=lint-extras"
193-
- "status-success=ci/centos/k8s-e2e-external-storage/1.26"
194-
- "status-success=ci/centos/k8s-e2e-external-storage/1.27"
195-
- "status-success=ci/centos/k8s-e2e-external-storage/1.28"
196190
- "status-success=ci/centos/k8s-e2e-external-storage/1.29"
197-
- "status-success=ci/centos/mini-e2e-helm/k8s-1.26"
198-
- "status-success=ci/centos/mini-e2e-helm/k8s-1.27"
199-
- "status-success=ci/centos/mini-e2e-helm/k8s-1.28"
191+
- "status-success=ci/centos/k8s-e2e-external-storage/1.30"
192+
- "status-success=ci/centos/k8s-e2e-external-storage/1.31"
200193
- "status-success=ci/centos/mini-e2e-helm/k8s-1.29"
201-
- "status-success=ci/centos/mini-e2e/k8s-1.26"
202-
- "status-success=ci/centos/mini-e2e/k8s-1.27"
203-
- "status-success=ci/centos/mini-e2e/k8s-1.28"
194+
- "status-success=ci/centos/mini-e2e-helm/k8s-1.30"
195+
- "status-success=ci/centos/mini-e2e-helm/k8s-1.31"
204196
- "status-success=ci/centos/mini-e2e/k8s-1.29"
197+
- "status-success=ci/centos/mini-e2e/k8s-1.30"
198+
- "status-success=ci/centos/mini-e2e/k8s-1.31"
205199
- "status-success=ci/centos/upgrade-tests-cephfs"
206200
- "status-success=ci/centos/upgrade-tests-rbd"
207201
- "status-success=DCO"
@@ -266,7 +260,7 @@ pull_request_rules:
266260
- "status-success=ci/centos/upgrade-tests-rbd"
267261
- "status-success=DCO"
268262
- and:
269-
- base=release-v3.11
263+
- base=release-v3.12
270264
- label!=DNM
271265
- label=ready-to-merge
272266
- "approved-reviews-by=@ceph/ceph-csi-maintainers"
@@ -278,18 +272,15 @@ pull_request_rules:
278272
- "status-success=mod-check"
279273
- "status-success=lint-extras"
280274
- "#changes-requested-reviews-by=0"
281-
- "status-success=ci/centos/k8s-e2e-external-storage/1.26"
282-
- "status-success=ci/centos/k8s-e2e-external-storage/1.27"
283-
- "status-success=ci/centos/k8s-e2e-external-storage/1.28"
284275
- "status-success=ci/centos/k8s-e2e-external-storage/1.29"
285-
- "status-success=ci/centos/mini-e2e-helm/k8s-1.26"
286-
- "status-success=ci/centos/mini-e2e-helm/k8s-1.27"
287-
- "status-success=ci/centos/mini-e2e-helm/k8s-1.28"
276+
- "status-success=ci/centos/k8s-e2e-external-storage/1.30"
277+
- "status-success=ci/centos/k8s-e2e-external-storage/1.31"
288278
- "status-success=ci/centos/mini-e2e-helm/k8s-1.29"
289-
- "status-success=ci/centos/mini-e2e/k8s-1.26"
290-
- "status-success=ci/centos/mini-e2e/k8s-1.27"
291-
- "status-success=ci/centos/mini-e2e/k8s-1.28"
279+
- "status-success=ci/centos/mini-e2e-helm/k8s-1.30"
280+
- "status-success=ci/centos/mini-e2e-helm/k8s-1.31"
292281
- "status-success=ci/centos/mini-e2e/k8s-1.29"
282+
- "status-success=ci/centos/mini-e2e/k8s-1.30"
283+
- "status-success=ci/centos/mini-e2e/k8s-1.31"
293284
- "status-success=ci/centos/upgrade-tests-cephfs"
294285
- "status-success=ci/centos/upgrade-tests-rbd"
295286
- "status-success=DCO"
@@ -298,23 +289,23 @@ pull_request_rules:
298289
name: default
299290
delete_head_branch: {}
300291

301-
- name: backport patches to release-v3.11 branch
292+
- name: backport patches to release-v3.12 branch
302293
conditions:
303294
- base=devel
304-
- label=backport-to-release-v3.11
295+
- label=backport-to-release-v3.12
305296
actions:
306297
backport:
307298
branches:
308-
- release-v3.11
299+
- release-v3.12
309300

310-
- name: backport patches to release-v3.12 branch
301+
- name: backport patches to release-v3.13 branch
311302
conditions:
312303
- base=devel
313-
- label=backport-to-release-v3.12
304+
- label=backport-to-release-v3.13
314305
actions:
315306
backport:
316307
branches:
317-
- release-v3.12
308+
- release-v3.13
318309

319310
- name: remove outdated approvals on ci/centos
320311
conditions:

0 commit comments

Comments
 (0)