From 8902d7095ea1da83323946fb4d3dbb60e6c8c6c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Wed, 29 Sep 2021 10:08:11 +0200 Subject: [PATCH 1/2] bot: remove old branch config from mergify MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don't backport to 1.4 or 1.5 anymore so let's clean up the file. Signed-off-by: Sébastien Han --- .mergify.yml | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index c3456a332..38764ea75 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -70,36 +70,6 @@ pull_request_rules: dismiss_reviews: {} delete_head_branch: {} - # release-1.4 branch - - name: automerge backport release-1.4 - conditions: - - author=mergify[bot] - - base=release-1.4 - - label!=do-not-merge - - 'status-success=DCO' - - 'status-success=continuous-integration/jenkins/pr-head' - actions: - merge: - method: merge - strict: false - dismiss_reviews: {} - delete_head_branch: {} - - # release-1.5 branch - - name: automerge backport release-1.5 - conditions: - - author=mergify[bot] - - base=release-1.5 - - label!=do-not-merge - - 'status-success=DCO' - - 'status-success=continuous-integration/jenkins/pr-head' - actions: - merge: - method: merge - strict: false - dismiss_reviews: {} - delete_head_branch: {} - # release-1.6 branch - name: automerge backport release-1.6 conditions: @@ -166,24 +136,6 @@ pull_request_rules: dismiss_reviews: {} delete_head_branch: {} - # release-1.4 branch - - actions: - backport: - branches: - - release-1.4 - conditions: - - label=backport-release-1.4 - name: backport release-1.4 - - # release-1.5 branch - - actions: - backport: - branches: - - release-1.5 - conditions: - - label=backport-release-1.5 - name: backport release-1.5 - # release-1.6 branch - actions: backport: From cc66fdb5d7ffd85f533bd083a53b93337cd5172e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Wed, 29 Sep 2021 10:17:29 +0200 Subject: [PATCH 2/2] bot: fix mergify merge rules for kubernetes version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CI's running versions were incorrect. Closes: https://github.com/rook/rook/issues/8865 Signed-off-by: Sébastien Han --- .mergify.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 38764ea75..5987b94b6 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -91,11 +91,12 @@ pull_request_rules: - 'check-success=encryption-pvc-db-wal' - 'check-success=encryption-pvc-kms-vault-token-auth' - 'check-success=TestCephSmokeSuite (v1.16.15)' - - 'check-success=TestCephSmokeSuite (v1.20.2)' + - 'check-success=TestCephSmokeSuite (v1.21.0)' - 'check-success=TestCephHelmSuite (v1.16.15)' - - 'check-success=TestCephHelmSuite (v1.20.2)' - - 'check-success=TestCephMultiClusterDeploySuite (v1.20.2)' - - 'check-success=TestCephUpgradeSuite (v1.20.2)' + - 'check-success=TestCephHelmSuite (v1.22.0)' + - 'check-success=TestCephMultiClusterDeploySuite (v1.21.0)' + - 'check-success=TestCephUpgradeSuite (v1.16.15)' + - 'check-success=TestCephUpgradeSuite (v1.21.0)' actions: merge: method: merge @@ -123,11 +124,12 @@ pull_request_rules: - 'check-success=encryption-pvc-db' - 'check-success=encryption-pvc-db-wal' - 'check-success=encryption-pvc-kms-vault-token-auth' - - 'check-success=TestCephSmokeSuite (v1.16.15)' + - 'check-success=TestCephSmokeSuite (v1.15.12)' - 'check-success=TestCephSmokeSuite (v1.21.0)' - - 'check-success=TestCephHelmSuite (v1.16.15)' + - 'check-success=TestCephHelmSuite (v1.15.12)' - 'check-success=TestCephHelmSuite (v1.21.0)' - 'check-success=TestCephMultiClusterDeploySuite (v1.21.0)' + - 'check-success=TestCephUpgradeSuite (v1.15.12)' - 'check-success=TestCephUpgradeSuite (v1.21.0)' actions: merge: