From 4dc001b7849920ce88e5b902fb866db1e8caa330 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Mon, 25 Nov 2024 12:27:11 -0700 Subject: [PATCH 1/2] ci: add 1.16 branch to mergify rules With the creation of the 1.16 branch, add the branch to the mergify rules. Signed-off-by: Travis Nielsen --- .mergify.yml | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index 28efa4c2c..fcac66285 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -291,6 +291,65 @@ pull_request_rules: dismiss_reviews: {} delete_head_branch: {} + # 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=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.11 branch - actions: backport: @@ -335,3 +394,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 From 4e727f302cadde7c8503ecc067899ee51e92413e Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Mon, 25 Nov 2024 12:29:19 -0700 Subject: [PATCH 2/2] ci: remove 1.11 and 1.12 branches from mergify rules Remove the 1.11 and 1.12 backport rules from mergify since no longer needed. Signed-off-by: Travis Nielsen --- .mergify.yml | 123 --------------------------------------------------- 1 file changed, 123 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index fcac66285..45938a112 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -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: @@ -350,24 +245,6 @@ pull_request_rules: dismiss_reviews: {} delete_head_branch: {} - # release-1.11 branch - - actions: - backport: - branches: - - release-1.11 - 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 - # release-1.13 branch - actions: backport: