Skip to content

Commit

Permalink
Merge pull request #9969 from travisn/mergify-1.9
Browse files Browse the repository at this point in the history
build: Add mergify rules for release-1.9
  • Loading branch information
travisn committed Apr 1, 2022
2 parents 55a8fb9 + bc5013e commit d847fc8
Showing 1 changed file with 53 additions and 51 deletions.
104 changes: 53 additions & 51 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,57 +15,6 @@ pull_request_rules:
comment:
message: Hi @{{author}}, this pull request was opened against a release branch, is it expected? Normally patches should go in the master branch first and then be backported to release branches.

# automerge on master only under certain strict conditions
- name: automerge merge master with specific label and approvals with code change
conditions:
- author=mergify[bot]
- base=master
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- label!=do-not-merge
- label=ready-to-merge
- 'check-success=DCO'
- 'check-success=canary'
- 'check-success=unittests'
- 'check-success=golangci-lint'
- 'check-success=codegen'
- 'check-success=lint'
- 'check-success=modcheck'
- 'check-success=pvc'
- 'check-success=pvc-db'
- 'check-success=pvc-db-wal'
- 'check-success=encryption-pvc'
- 'check-success=encryption-pvc-db'
- 'check-success=encryption-pvc-db-wal'
- 'check-success=encryption-pvc-kms-vault-token-auth'
- 'check-success=TestCephSmokeSuite'
- 'check-success=TestCephHelmSuite'
- 'check-success=TestCephMultiClusterDeploySuite'
- 'check-success=TestCephUpgradeSuite'
- 'check-success=TestCephObjectSuite'
actions:
merge:
method: merge
dismiss_reviews: {}
delete_head_branch: {}

- name: automerge merge master with specific label and approvals without code change
conditions:
- author=mergify[bot]
- base=master
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- label!=do-not-merge
- label=ready-to-merge
- 'check-success=lint'
- 'check-success=DCO'
- 'check-success=build'
actions:
merge:
method: merge
dismiss_reviews: {}
delete_head_branch: {}

# release-1.6 branch
- name: automerge backport release-1.6
conditions:
Expand Down Expand Up @@ -169,6 +118,50 @@ pull_request_rules:
dismiss_reviews: {}
delete_head_branch: {}

# release-1.9 branch
- name: automerge backport release-1.9
conditions:
- author=mergify[bot]
- base=release-1.9
- label!=do-not-merge
- 'status-success=DCO'
- 'check-success=canary'
- 'check-success=unittests'
- 'check-success=golangci-lint'
- 'check-success=codegen'
- 'check-success=codespell'
- 'check-success=lint'
- 'check-success=modcheck'
- 'check-success=Shellcheck'
- 'check-success=yaml-linter'
- 'check-success=lint-test'
- 'check-success=gen-rbac'
- 'check-success=crds-gen'
- 'check-success=pvc'
- 'check-success=pvc-db'
- 'check-success=pvc-db-wal'
- 'check-success=encryption-pvc'
- 'check-success=encryption-pvc-db'
- 'check-success=encryption-pvc-db-wal'
- 'check-success=encryption-pvc-kms-vault-token-auth'
- 'check-success=encryption-pvc-kms-vault-k8s-auth'
- 'check-success=encryption-pvc-kms-ibm-kp'
- 'check-success=lvm-pvc'
- 'check-success=multi-cluster-mirroring'
- 'check-success=rgw-multisite-testing'
- 'check-success=TestCephSmokeSuite (v1.16.15)'
- 'check-success=TestCephSmokeSuite (v1.23.0)'
- 'check-success=TestCephHelmSuite (v1.16.15)'
- 'check-success=TestCephHelmSuite (v1.23.0)'
- 'check-success=TestCephMultiClusterDeploySuite (v1.23.0)'
- 'check-success=TestCephUpgradeSuite (v1.16.15)'
- 'check-success=TestCephUpgradeSuite (v1.23.0)'
actions:
merge:
method: merge
dismiss_reviews: {}
delete_head_branch: {}

# release-1.6 branch
- actions:
backport:
Expand All @@ -195,3 +188,12 @@ pull_request_rules:
conditions:
- label=backport-release-1.8
name: backport release-1.8

# release-1.9 branch
- actions:
backport:
branches:
- release-1.9
conditions:
- label=backport-release-1.9
name: backport release-1.9

0 comments on commit d847fc8

Please sign in to comment.