Skip to content

Commit

Permalink
ci: update rules for 3.12 release
Browse files Browse the repository at this point in the history
updating release for 3.12 release

Signed-off-by: Madhu Rajanna <[email protected]>
  • Loading branch information
Madhu-1 authored and mergify[bot] committed Aug 14, 2024
1 parent 50c202b commit b0751cb
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 56 deletions.
26 changes: 15 additions & 11 deletions .github/workflows/pull-request-commentor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,28 @@ jobs:

strategy:
matrix:
branch: [release-v3.10, release-v3.11, devel]
k8s: ["1.26", "1.27", "1.28", "1.29", "1.30"]
branch: [release-v3.11, release-v3.12, devel]
k8s: ["1.26", "1.27", "1.28", "1.29", "1.30", "1.31"]
exclude:
# the next Ceph-CSI version will not be tested with old Kubernetes
# Run only last 3 support releases on devel and 3.12
- k8s: "1.26"
branch: "release-v3.11"
branch: "release-v3.12"
- k8s: "1.26"
branch: "devel"

- k8s: "1.27"
branch: "release-v3.12"
- k8s: "1.27"
branch: "devel"
- k8s: "1.28"
branch: "release-v3.12"
- k8s: "1.28"
branch: "devel"
# Ceph-CSI <= 3.11 was released before Kubernetes 1.30
- k8s: "1.30"
branch: "release-v3.11"

# Ceph-CSI <= 3.10 was released before Kubernetes 1.29
- k8s: "1.29"
branch: "release-v3.10"
- k8s: "1.30"
branch: "release-v3.10"
# Ceph-CSI <= 3.11 was released before Kubernetes 1.31
- k8s: "1.31"
branch: "release-v3.11"

# watch out, matrix.branch can not be used in this if-statement :-/
if: >
Expand Down
90 changes: 45 additions & 45 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@ queue_rules:
- "status-success=mod-check"
- "status-success=lint-extras"
- "status-success=uncommitted-code-check"
- "status-success=ci/centos/k8s-e2e-external-storage/1.27"
- "status-success=ci/centos/k8s-e2e-external-storage/1.28"
- "status-success=ci/centos/k8s-e2e-external-storage/1.29"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.27"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.28"
- "status-success=ci/centos/k8s-e2e-external-storage/1.30"
- "status-success=ci/centos/k8s-e2e-external-storage/1.31"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.29"
- "status-success=ci/centos/mini-e2e/k8s-1.27"
- "status-success=ci/centos/mini-e2e/k8s-1.28"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.30"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.31"
- "status-success=ci/centos/mini-e2e/k8s-1.29"
- "status-success=ci/centos/mini-e2e/k8s-1.30"
- "status-success=ci/centos/mini-e2e/k8s-1.31"
- "status-success=ci/centos/upgrade-tests-cephfs"
- "status-success=ci/centos/upgrade-tests-rbd"
- and:
- base=release-v3.10
- base=release-v3.11
- "status-success=codespell"
- "status-success=multi-arch-build"
- "status-success=go-test"
Expand All @@ -57,12 +57,15 @@ queue_rules:
- "status-success=ci/centos/k8s-e2e-external-storage/1.26"
- "status-success=ci/centos/k8s-e2e-external-storage/1.27"
- "status-success=ci/centos/k8s-e2e-external-storage/1.28"
- "status-success=ci/centos/k8s-e2e-external-storage/1.29"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.26"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.27"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.28"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.29"
- "status-success=ci/centos/mini-e2e/k8s-1.26"
- "status-success=ci/centos/mini-e2e/k8s-1.27"
- "status-success=ci/centos/mini-e2e/k8s-1.28"
- "status-success=ci/centos/mini-e2e/k8s-1.29"
- "status-success=ci/centos/upgrade-tests-cephfs"
- "status-success=ci/centos/upgrade-tests-rbd"
- and:
Expand All @@ -74,18 +77,15 @@ queue_rules:
- "status-success=mod-check"
- "status-success=lint-extras"
- "status-success=uncommitted-code-check"
- "status-success=ci/centos/k8s-e2e-external-storage/1.27"
- "status-success=ci/centos/k8s-e2e-external-storage/1.28"
- "status-success=ci/centos/k8s-e2e-external-storage/1.29"
- "status-success=ci/centos/k8s-e2e-external-storage/1.30"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.27"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.28"
- "status-success=ci/centos/k8s-e2e-external-storage/1.31"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.29"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.30"
- "status-success=ci/centos/mini-e2e/k8s-1.27"
- "status-success=ci/centos/mini-e2e/k8s-1.28"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.31"
- "status-success=ci/centos/mini-e2e/k8s-1.29"
- "status-success=ci/centos/mini-e2e/k8s-1.30"
- "status-success=ci/centos/mini-e2e/k8s-1.31"
- "status-success=ci/centos/upgrade-tests-cephfs"
- "status-success=ci/centos/upgrade-tests-rbd"
- and:
Expand Down Expand Up @@ -144,18 +144,15 @@ pull_request_rules:
- "status-success=golangci-lint"
- "status-success=mod-check"
- "status-success=lint-extras"
- "status-success=ci/centos/k8s-e2e-external-storage/1.27"
- "status-success=ci/centos/k8s-e2e-external-storage/1.28"
- "status-success=ci/centos/k8s-e2e-external-storage/1.29"
- "status-success=ci/centos/k8s-e2e-external-storage/1.30"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.27"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.28"
- "status-success=ci/centos/k8s-e2e-external-storage/1.31"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.29"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.30"
- "status-success=ci/centos/mini-e2e/k8s-1.27"
- "status-success=ci/centos/mini-e2e/k8s-1.28"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.31"
- "status-success=ci/centos/mini-e2e/k8s-1.29"
- "status-success=ci/centos/mini-e2e/k8s-1.30"
- "status-success=ci/centos/mini-e2e/k8s-1.31"
- "status-success=ci/centos/upgrade-tests-cephfs"
- "status-success=ci/centos/upgrade-tests-rbd"
- "status-success=DCO"
Expand Down Expand Up @@ -190,20 +187,20 @@ pull_request_rules:
- "status-success=mod-check"
- "status-success=multi-arch-build"
- "status-success=uncommitted-code-check"
- "status-success=ci/centos/k8s-e2e-external-storage/1.27"
- "status-success=ci/centos/k8s-e2e-external-storage/1.28"
- "status-success=ci/centos/k8s-e2e-external-storage/1.29"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.27"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.28"
- "status-success=ci/centos/k8s-e2e-external-storage/1.30"
- "status-success=ci/centos/k8s-e2e-external-storage/1.31"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.29"
- "status-success=ci/centos/mini-e2e/k8s-1.27"
- "status-success=ci/centos/mini-e2e/k8s-1.28"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.30"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.31"
- "status-success=ci/centos/mini-e2e/k8s-1.29"
- "status-success=ci/centos/mini-e2e/k8s-1.30"
- "status-success=ci/centos/mini-e2e/k8s-1.31"
- "status-success=ci/centos/upgrade-tests-cephfs"
- "status-success=ci/centos/upgrade-tests-rbd"
- and:
- label!=DNM
- base=release-v3.10
- base=release-v3.11
- "#approved-reviews-by>=2"
- "#changes-requested-reviews-by=0"
- "approved-reviews-by=@ceph/ceph-csi-contributors"
Expand All @@ -218,12 +215,15 @@ pull_request_rules:
- "status-success=ci/centos/k8s-e2e-external-storage/1.26"
- "status-success=ci/centos/k8s-e2e-external-storage/1.27"
- "status-success=ci/centos/k8s-e2e-external-storage/1.28"
- "status-success=ci/centos/k8s-e2e-external-storage/1.29"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.26"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.27"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.28"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.29"
- "status-success=ci/centos/mini-e2e/k8s-1.26"
- "status-success=ci/centos/mini-e2e/k8s-1.27"
- "status-success=ci/centos/mini-e2e/k8s-1.28"
- "status-success=ci/centos/mini-e2e/k8s-1.29"
- "status-success=ci/centos/upgrade-tests-cephfs"
- "status-success=ci/centos/upgrade-tests-rbd"
- "status-success=DCO"
Expand All @@ -241,18 +241,15 @@ pull_request_rules:
- "status-success=commitlint"
- "status-success=mod-check"
- "status-success=lint-extras"
- "status-success=ci/centos/k8s-e2e-external-storage/1.27"
- "status-success=ci/centos/k8s-e2e-external-storage/1.28"
- "status-success=ci/centos/k8s-e2e-external-storage/1.29"
- "status-success=ci/centos/k8s-e2e-external-storage/1.30"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.27"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.28"
- "status-success=ci/centos/k8s-e2e-external-storage/1.31"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.29"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.30"
- "status-success=ci/centos/mini-e2e/k8s-1.27"
- "status-success=ci/centos/mini-e2e/k8s-1.28"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.31"
- "status-success=ci/centos/mini-e2e/k8s-1.29"
- "status-success=ci/centos/mini-e2e/k8s-1.30"
- "status-success=ci/centos/mini-e2e/k8s-1.31"
- "status-success=ci/centos/upgrade-tests-cephfs"
- "status-success=ci/centos/upgrade-tests-rbd"
- "status-success=DCO"
Expand All @@ -278,20 +275,20 @@ pull_request_rules:
- "status-success=lint-extras"
- "#changes-requested-reviews-by=0"
- "status-success=uncommitted-code-check"
- "status-success=ci/centos/k8s-e2e-external-storage/1.27"
- "status-success=ci/centos/k8s-e2e-external-storage/1.28"
- "status-success=ci/centos/k8s-e2e-external-storage/1.29"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.27"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.28"
- "status-success=ci/centos/k8s-e2e-external-storage/1.30"
- "status-success=ci/centos/k8s-e2e-external-storage/1.31"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.29"
- "status-success=ci/centos/mini-e2e/k8s-1.27"
- "status-success=ci/centos/mini-e2e/k8s-1.28"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.30"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.31"
- "status-success=ci/centos/mini-e2e/k8s-1.29"
- "status-success=ci/centos/mini-e2e/k8s-1.30"
- "status-success=ci/centos/mini-e2e/k8s-1.31"
- "status-success=ci/centos/upgrade-tests-cephfs"
- "status-success=ci/centos/upgrade-tests-rbd"
- "status-success=DCO"
- and:
- base=release-v3.10
- base=release-v3.11
- label!=DNM
- label=ready-to-merge
- "approved-reviews-by=@ceph/ceph-csi-maintainers"
Expand All @@ -306,12 +303,15 @@ pull_request_rules:
- "status-success=ci/centos/k8s-e2e-external-storage/1.26"
- "status-success=ci/centos/k8s-e2e-external-storage/1.27"
- "status-success=ci/centos/k8s-e2e-external-storage/1.28"
- "status-success=ci/centos/k8s-e2e-external-storage/1.29"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.26"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.27"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.28"
- "status-success=ci/centos/mini-e2e-helm/k8s-1.29"
- "status-success=ci/centos/mini-e2e/k8s-1.26"
- "status-success=ci/centos/mini-e2e/k8s-1.27"
- "status-success=ci/centos/mini-e2e/k8s-1.28"
- "status-success=ci/centos/mini-e2e/k8s-1.29"
- "status-success=ci/centos/upgrade-tests-cephfs"
- "status-success=ci/centos/upgrade-tests-rbd"
- "status-success=DCO"
Expand All @@ -320,23 +320,23 @@ pull_request_rules:
name: default
delete_head_branch: {}

- name: backport patches to release-v3.10 branch
- name: backport patches to release-v3.11 branch
conditions:
- base=devel
- label=backport-to-release-v3.10
- label=backport-to-release-v3.11
actions:
backport:
branches:
- release-v3.10
- release-v3.11

- name: backport patches to release-v3.11 branch
- name: backport patches to release-v3.12 branch
conditions:
- base=devel
- label=backport-to-release-v3.11
- label=backport-to-release-v3.12
actions:
backport:
branches:
- release-v3.11
- release-v3.12

- name: remove outdated approvals on ci/centos
conditions:
Expand Down

0 comments on commit b0751cb

Please sign in to comment.