Merge pull request #15061 from travisn/mergify-1.16
ci: Add 1.16 branch to mergify rules and remove obsolete branches
This commit is contained in:
1 file changed
+66
-121
+66
-121
@@ -15,111 +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.
|
||||
|
||||
# release-1.11 branch
|
||||
- name: automerge backport release-1.11
|
||||
conditions:
|
||||
- author=mergify[bot]
|
||||
- base=release-1.11
|
||||
- label!=do-not-merge
|
||||
- "status-success=DCO"
|
||||
- "check-success=linux-build-all (1.19)"
|
||||
- "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=docs-check"
|
||||
- "check-success=pylint"
|
||||
- "check-success=canary"
|
||||
- "check-success=raw-disk"
|
||||
- "check-success=two-osds-in-device"
|
||||
- "check-success=osd-with-metadata-device"
|
||||
- "check-success=encryption"
|
||||
- "check-success=lvm"
|
||||
- "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=lvm-pvc"
|
||||
- "check-success=rgw-multisite-testing"
|
||||
- "check-success=TestCephSmokeSuite (v1.21.14)"
|
||||
- "check-success=TestCephSmokeSuite (v1.26.1)"
|
||||
- "check-success=TestCephHelmSuite (v1.21.14)"
|
||||
- "check-success=TestCephHelmSuite (v1.26.1)"
|
||||
- "check-success=TestCephMultiClusterDeploySuite (v1.26.1)"
|
||||
- "check-success=TestCephUpgradeSuite (v1.21.14)"
|
||||
- "check-success=TestCephUpgradeSuite (v1.26.1)"
|
||||
- "check-success=TestHelmUpgradeSuite (v1.21.14)"
|
||||
- "check-success=TestHelmUpgradeSuite (v1.26.1)"
|
||||
actions:
|
||||
merge:
|
||||
method: merge
|
||||
dismiss_reviews: {}
|
||||
delete_head_branch: {}
|
||||
|
||||
# release-1.12 branch
|
||||
- name: automerge backport release-1.12
|
||||
conditions:
|
||||
- author=mergify[bot]
|
||||
- base=release-1.12
|
||||
- label!=do-not-merge
|
||||
- "status-success=DCO"
|
||||
- "check-success=linux-build-all (1.21)"
|
||||
- "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=docs-check"
|
||||
- "check-success=pylint"
|
||||
- "check-success=canary"
|
||||
- "check-success=raw-disk"
|
||||
- "check-success=two-osds-in-device"
|
||||
- "check-success=osd-with-metadata-device"
|
||||
- "check-success=encryption"
|
||||
- "check-success=lvm"
|
||||
- "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=lvm-pvc"
|
||||
- "check-success=rgw-multisite-testing"
|
||||
- "check-success=TestCephSmokeSuite (v1.22.17)"
|
||||
- "check-success=TestCephSmokeSuite (v1.28.0)"
|
||||
- "check-success=TestCephHelmSuite (v1.22.17)"
|
||||
- "check-success=TestCephHelmSuite (v1.28.0)"
|
||||
- "check-success=TestCephMultiClusterDeploySuite (v1.28.0)"
|
||||
- "check-success=TestCephObjectSuite (v1.27.2)"
|
||||
- "check-success=TestCephUpgradeSuite (v1.22.17)"
|
||||
- "check-success=TestCephUpgradeSuite (v1.28.0)"
|
||||
- "check-success=TestHelmUpgradeSuite (v1.22.17)"
|
||||
- "check-success=TestHelmUpgradeSuite (v1.28.0)"
|
||||
actions:
|
||||
merge:
|
||||
method: merge
|
||||
dismiss_reviews: {}
|
||||
delete_head_branch: {}
|
||||
|
||||
# release-1.13 branch
|
||||
- name: automerge backport release-1.13
|
||||
conditions:
|
||||
@@ -291,23 +186,64 @@ pull_request_rules:
|
||||
dismiss_reviews: {}
|
||||
delete_head_branch: {}
|
||||
|
||||
# release-1.11 branch
|
||||
- actions:
|
||||
backport:
|
||||
branches:
|
||||
- release-1.11
|
||||
# release-1.16 branch
|
||||
- name: automerge backport release-1.16
|
||||
conditions:
|
||||
- label=backport-release-1.11
|
||||
name: backport release-1.11
|
||||
|
||||
# release-1.12 branch
|
||||
- actions:
|
||||
backport:
|
||||
branches:
|
||||
- release-1.12
|
||||
conditions:
|
||||
- label=backport-release-1.12
|
||||
name: backport release-1.12
|
||||
- author=mergify[bot]
|
||||
- base=release-1.16
|
||||
- label!=do-not-merge
|
||||
- "status-success=DCO"
|
||||
- "check-success=linux-build-all (1.22)"
|
||||
- "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=docs-check"
|
||||
- "check-success=pylint"
|
||||
- "check-success=canary-tests / canary (quay.io/ceph/ceph:v18)"
|
||||
- "check-success=canary-tests / raw-disk-with-object (quay.io/ceph/ceph:v18)"
|
||||
- "check-success=canary-tests / two-osds-in-device (quay.io/ceph/ceph:v18)"
|
||||
- "check-success=canary-tests / osd-with-metadata-partition-device (quay.io/ceph/ceph:v18)"
|
||||
- "check-success=canary-tests / osd-with-metadata-device (quay.io/ceph/ceph:v18)"
|
||||
- "check-success=canary-tests / encryption (quay.io/ceph/ceph:v18)"
|
||||
- "check-success=canary-tests / lvm (quay.io/ceph/ceph:v18)"
|
||||
- "check-success=canary-tests / pvc (quay.io/ceph/ceph:v18)"
|
||||
- "check-success=canary-tests / pvc-db (quay.io/ceph/ceph:v18)"
|
||||
- "check-success=canary-tests / pvc-db-wal (quay.io/ceph/ceph:v18)"
|
||||
- "check-success=canary-tests / encryption-pvc (quay.io/ceph/ceph:v18)"
|
||||
- "check-success=canary-tests / encryption-pvc-db (quay.io/ceph/ceph:v18)"
|
||||
- "check-success=canary-tests / encryption-pvc-db-wal (quay.io/ceph/ceph:v18)"
|
||||
- "check-success=canary-tests / encryption-pvc-kms-vault-token-auth (quay.io/ceph/ceph:v18)"
|
||||
- "check-success=canary-tests / encryption-pvc-kms-vault-k8s-auth (quay.io/ceph/ceph:v18)"
|
||||
- "check-success=canary-tests / lvm-pvc (quay.io/ceph/ceph:v18)"
|
||||
- "check-success=canary-tests / multi-cluster-mirroring (quay.io/ceph/ceph:v18)"
|
||||
- "check-success=canary-tests / rgw-multisite-testing (quay.io/ceph/ceph:v18)"
|
||||
- "check-success=canary-tests / encryption-pvc-kms-ibm-kp (quay.io/ceph/ceph:v18)"
|
||||
- "check-success=canary-tests / multus-public-and-cluster (quay.io/ceph/ceph:v18)"
|
||||
- "check-success=canary-tests / csi-hostnetwork-disabled (quay.io/ceph/ceph:v18)"
|
||||
- "check-success=TestCephSmokeSuite (v1.27.16)"
|
||||
- "check-success=TestCephSmokeSuite (v1.31.0)"
|
||||
- "check-success=TestCephHelmSuite (v1.27.16)"
|
||||
- "check-success=TestCephHelmSuite (v1.31.0)"
|
||||
- "check-success=TestCephMultiClusterDeploySuite (v1.31.0)"
|
||||
- "check-success=TestCephObjectSuite (v1.27.16)"
|
||||
- "check-success=TestCephObjectSuite (v1.31.0)"
|
||||
- "check-success=TestCephUpgradeSuite (v1.27.16)"
|
||||
- "check-success=TestCephUpgradeSuite (v1.31.0)"
|
||||
- "check-success=TestHelmUpgradeSuite (v1.27.16)"
|
||||
- "check-success=TestHelmUpgradeSuite (v1.31.0)"
|
||||
actions:
|
||||
merge:
|
||||
method: merge
|
||||
dismiss_reviews: {}
|
||||
delete_head_branch: {}
|
||||
|
||||
# release-1.13 branch
|
||||
- actions:
|
||||
@@ -335,3 +271,12 @@ pull_request_rules:
|
||||
conditions:
|
||||
- label=backport-release-1.15
|
||||
name: backport release-1.15
|
||||
|
||||
# release-1.16 branch
|
||||
- actions:
|
||||
backport:
|
||||
branches:
|
||||
- release-1.16
|
||||
conditions:
|
||||
- label=backport-release-1.16
|
||||
name: backport release-1.16
|
||||
Reference in new issue
Block a user