From b97ca488d2af766a74bfd54edbb600dbe241d58c Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Fri, 17 Apr 2026 08:38:49 -0600 Subject: [PATCH] build: remove obsolete branches from mergify The mergify tool is only used to open backports for active branches. Remove the v1.15 and v1.16 branches from mergify as their backports are no longer supported. Signed-off-by: Travis Nielsen --- .mergify.yml | 133 --------------------------------------------------- 1 file changed, 133 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 467cb3d3a..6fc1a90fc 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -15,121 +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.15 branch - - name: automerge backport release-1.15 - conditions: - - author=mergify[bot] - - base=release-1.15 - - 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-cluster-network (quay.io/ceph/ceph:v18)" # note: changed name for 1.16 (multus-public-and-cluster) - - "check-success=canary-tests / csi-hostnetwork-disabled (quay.io/ceph/ceph:v18)" - - "check-success=TestCephSmokeSuite (v1.26.15)" - - "check-success=TestCephSmokeSuite (v1.31.0)" - - "check-success=TestCephHelmSuite (v1.26.15)" - - "check-success=TestCephHelmSuite (v1.31.0)" - - "check-success=TestCephMultiClusterDeploySuite (v1.31.0)" - - "check-success=TestCephObjectSuite (v1.26.15)" - - "check-success=TestCephObjectSuite (v1.31.0)" - - "check-success=TestCephUpgradeSuite (v1.26.15)" - - "check-success=TestCephUpgradeSuite (v1.31.0)" - - "check-success=TestHelmUpgradeSuite (v1.26.15)" - - "check-success=TestHelmUpgradeSuite (v1.31.0)" - actions: - merge: - method: merge - dismiss_reviews: {} - - # release-1.16 branch - - name: automerge backport release-1.16 - conditions: - - author=mergify[bot] - - base=release-1.16 - - label!=do-not-merge - - "status-success=DCO" - - "check-success=linux-build-all (1.22)" - - "check-success=linux-build-all (1.23)" - - "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:v19)" - - "check-success=canary-tests / raw-disk-with-object (quay.io/ceph/ceph:v19)" - - "check-success=canary-tests / two-osds-in-device (quay.io/ceph/ceph:v19)" - - "check-success=canary-tests / osd-with-metadata-partition-device (quay.io/ceph/ceph:v19)" - - "check-success=canary-tests / osd-with-metadata-device (quay.io/ceph/ceph:v19)" - - "check-success=canary-tests / encryption (quay.io/ceph/ceph:v19)" - - "check-success=canary-tests / lvm (quay.io/ceph/ceph:v19)" - - "check-success=canary-tests / pvc (quay.io/ceph/ceph:v19)" - - "check-success=canary-tests / pvc-db (quay.io/ceph/ceph:v19)" - - "check-success=canary-tests / pvc-db-wal (quay.io/ceph/ceph:v19)" - - "check-success=canary-tests / encryption-pvc (quay.io/ceph/ceph:v19)" - - "check-success=canary-tests / encryption-pvc-db (quay.io/ceph/ceph:v19)" - - "check-success=canary-tests / encryption-pvc-db-wal (quay.io/ceph/ceph:v19)" - - "check-success=canary-tests / encryption-pvc-kms-vault-token-auth (quay.io/ceph/ceph:v19)" - - "check-success=canary-tests / encryption-pvc-kms-vault-k8s-auth (quay.io/ceph/ceph:v19)" - - "check-success=canary-tests / lvm-pvc (quay.io/ceph/ceph:v19)" - - "check-success=canary-tests / multi-cluster-mirroring (quay.io/ceph/ceph:v19)" - - "check-success=canary-tests / encryption-pvc-kms-ibm-kp (quay.io/ceph/ceph:v19)" - - "check-success=canary-tests / multus-public-and-cluster (quay.io/ceph/ceph:v19)" - - "check-success=TestCephSmokeSuite (v1.27.16)" - - "check-success=TestCephSmokeSuite (v1.32.0)" - - "check-success=TestCephHelmSuite (v1.27.16)" - - "check-success=TestCephHelmSuite (v1.32.0)" - - "check-success=TestCephMultiClusterDeploySuite (v1.32.0)" - - "check-success=TestCephObjectSuite (v1.27.16)" - - "check-success=TestCephObjectSuite (v1.32.0)" - - "check-success=TestCephUpgradeSuite (v1.27.16)" - - "check-success=TestCephUpgradeSuite (v1.32.0)" - - "check-success=TestHelmUpgradeSuite (v1.27.16)" - - "check-success=TestHelmUpgradeSuite (v1.32.0)" - actions: - merge: - method: merge - dismiss_reviews: {} - # release-1.17 branch - name: automerge backport release-1.17 conditions: @@ -308,24 +193,6 @@ pull_request_rules: method: merge dismiss_reviews: {} - # release-1.15 branch - - actions: - backport: - branches: - - release-1.15 - 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 - # release-1.17 branch - actions: backport: