From 841500ed35a0e7fee9dfc4b221dce85da7f005e2 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Thu, 31 Jul 2025 12:11:58 -0600 Subject: [PATCH] ci: enable automerge for 1.18 backports Merify requires the exact names of the successful CI actions for automerge. Add the 1.18 actions to the list. Signed-off-by: Travis Nielsen --- .mergify.yml | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index a5de1dd32..29f506ef6 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -252,6 +252,66 @@ pull_request_rules: dismiss_reviews: {} delete_head_branch: {} + # release-1.18 branch + - name: automerge backport release-1.18 + conditions: + - author=mergify[bot] + - base=release-1.18 + - label!=do-not-merge + - "status-success=DCO" + - "check-success=codegen" + - "check-success=codespell" + - "check-success=crds-gen" + - "check-success=docs-check" + - "check-success=gen-rbac" + - "check-success=golangci-lint" + - "check-success=govulncheck" + - "check-success=lint" + - "check-success=lint-test" + - "check-success=linux-build-all (1.24)" + - "check-success=misspell" + - "check-success=modcheck" + - "check-success=pylint" + - "check-success=Shellcheck" + - "check-success=unittests" + - "check-success=yaml-linter" + - "check-success=canary-tests / canary (quay.io/ceph/ceph:v19)" + - "check-success=canary-tests / encryption (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-ibm-kp (quay.io/ceph/ceph:v19)" + - "check-success=canary-tests / encryption-pvc-kms-vault-k8s-auth (quay.io/ceph/ceph:v19)" + - "check-success=canary-tests / encryption-pvc-kms-vault-token-auth (quay.io/ceph/ceph:v19)" + - "check-success=canary-tests / lvm (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 / multus-public-and-cluster (quay.io/ceph/ceph:v19)" + - "check-success=canary-tests / osd-with-metadata-device (quay.io/ceph/ceph:v19)" + - "check-success=canary-tests / osd-with-metadata-partition-device (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 / raw-disk-with-object (quay.io/ceph/ceph:v19)" + - "check-success=canary-tests / two-object-one-zone (quay.io/ceph/ceph:v19)" + - "check-success=canary-tests / two-osds-in-device (quay.io/ceph/ceph:v19)" + - "check-success=TestCephHelmSuite (v3.13.3, v1.33.0)" + - "check-success=TestCephHelmSuite (v3.18.3, v1.33.0)" + - "check-success=TestCephMultiClusterDeploySuite (v1.33.0)" + - "check-success=TestCephObjectSuite (v1.28.15)" + - "check-success=TestCephObjectSuite (v1.33.0)" + - "check-success=TestCephSmokeSuite (v1.28.15)" + - "check-success=TestCephSmokeSuite (v1.33.0)" + - "check-success=TestCephUpgradeSuite (v1.28.15)" + - "check-success=TestCephUpgradeSuite (v1.33.0)" + - "check-success=TestHelmUpgradeSuite (v1.28.15)" + - "check-success=TestHelmUpgradeSuite (v1.33.0)" + actions: + merge: + method: merge + dismiss_reviews: {} + delete_head_branch: {} + # release-1.14 branch - actions: backport: @@ -287,3 +347,12 @@ pull_request_rules: conditions: - label=backport-release-1.17 name: backport release-1.17 + + # release-1.18 branch + - actions: + backport: + branches: + - release-1.18 + conditions: + - label=backport-release-1.18 + name: backport release-1.18