mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-17 20:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
285028727a
ceph-csi/.mergify.yml

168 lines
4.7 KiB
YAML
Raw Normal View History

Fix yaml lint error in mergify Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2019-03-22 05:27:56 +00:00
---
add mergify as a merge engine From now on, each PR will be merged automatically if: * there is no DNM label on the PR AND * the PR has at least one approuval AND * the travis CI successfully passed Closes: https://github.com/ceph/ceph-csi/issues/154 Signed-off-by: Sébastien Han <seb@redhat.com>
2019-01-31 17:03:31 +00:00
pull_request_rules:
mergify: Remove approved review when a PR changes When people have reviewed a PR, and the contributor updates it, the reviews are staying valid. This is unfortunate as the PR might need new corrections. Ideally a positive review (Approved) needs to be given again. And there needs to be a confirmation that a negative review (Changes requested) has been addressed. Closes: #505 Signed-off-by: Niels de Vos <ndevos@redhat.com>
2019-09-02 11:45:21 +00:00
- name: remove outdated approvals
conditions:
- base=master
actions:
dismiss_reviews:
approved: true
changes_requested: false
ci: Add mergify rule for conflict Added mergify rules to post a message when there is conflict on the PR. ref: https://doc.mergify.io/examples.html#request-for-action Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-05-14 10:45:01 +00:00
- name: ask to resolve conflict
conditions:
- conflict
actions:
comment:
# yamllint disable-line rule:truthy
message: "This pull request now has conflicts with the target branch.
Could you please resolve conflicts and force push the corrected
changes? 🙏"
add mergify as a merge engine From now on, each PR will be merged automatically if: * there is no DNM label on the PR AND * the PR has at least one approuval AND * the travis CI successfully passed Closes: https://github.com/ceph/ceph-csi/issues/154 Signed-off-by: Sébastien Han <seb@redhat.com>
2019-01-31 17:03:31 +00:00
- name: automatic merge
conditions:
- label!=DNM
update mergify for auto merging update rules to auto merge in master branch Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2019-09-27 12:47:41 +00:00
- base=master
Replace `'` with `"` in mergify.yaml as per the examples rules in https://doc.mergify.io/examples.html, string are surrounded by `""`, it better to follow same format here also. Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2019-09-27 08:27:13 +00:00
- "#approved-reviews-by>=2"
if there are changes requested dont merge PR Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2019-09-27 08:31:52 +00:00
- "#changes-requested-reviews-by=0"
Replace `'` with `"` in mergify.yaml as per the examples rules in https://doc.mergify.io/examples.html, string are surrounded by `""`, it better to follow same format here also. Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2019-09-27 08:27:13 +00:00
- "status-success=continuous-integration/travis-ci/pr"
ci: disable centos ci checks from mergify CentOS CI outage block PRs to get merged even when it has enough approvals. Disabling the centos check for now as there is no ETA on the availability of the setup atm. Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
2020-07-15 12:07:47 +00:00
# Removing/disabling centos check for now as centosci setup is down
# -"status-success=ci/centos/containerized-tests"
CI: update mergify rules Updated mergify rules to consider DCO and commitlint status Fixes #1016 Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-05-06 05:50:13 +00:00
- "status-success=DCO"
- "status-success=commitlint"
add mergify as a merge engine From now on, each PR will be merged automatically if: * there is no DNM label on the PR AND * the PR has at least one approuval AND * the travis CI successfully passed Closes: https://github.com/ceph/ceph-csi/issues/154 Signed-off-by: Sébastien Han <seb@redhat.com>
2019-01-31 17:03:31 +00:00
actions:
merge:
method: rebase
rebase_fallback: merge
strict: smart
dismiss_reviews: {}
CI: Add Rule to auto merge PR If the PR is having trivial changes or the reviewer is confident enough that PR doesn't need a second review, the reviewer can set `ready-to-merge` label on the PR. The bot will merge the PR if it's having one approval and the label `ready-to-merge` Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-05-15 08:25:09 +00:00
delete_head_branch: {}
- name: automatic merge PR having ready-to-merge label
conditions:
- label!=DNM
- label=ready-to-merge
- base=master
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- "status-success=continuous-integration/travis-ci/pr"
ci: disable centos ci checks from mergify CentOS CI outage block PRs to get merged even when it has enough approvals. Disabling the centos check for now as there is no ETA on the availability of the setup atm. Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
2020-07-15 12:07:47 +00:00
# Removing/disabling centos check for now as centosci setup is down
# - "status-success=ci/centos/containerized-tests"
CI: Add Rule to auto merge PR If the PR is having trivial changes or the reviewer is confident enough that PR doesn't need a second review, the reviewer can set `ready-to-merge` label on the PR. The bot will merge the PR if it's having one approval and the label `ready-to-merge` Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-05-15 08:25:09 +00:00
- "status-success=DCO"
- "status-success=commitlint"
actions:
merge:
method: rebase
rebase_fallback: merge
strict: smart
dismiss_reviews: {}
add mergify as a merge engine From now on, each PR will be merged automatically if: * there is no DNM label on the PR AND * the PR has at least one approuval AND * the travis CI successfully passed Closes: https://github.com/ceph/ceph-csi/issues/154 Signed-off-by: Sébastien Han <seb@redhat.com>
2019-01-31 17:03:31 +00:00
delete_head_branch: {}
Update mergify to release-v2.0 Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-01-20 11:05:47 +00:00
- name: backport patches to release v1.2.0 branch
Backport PR when label is set backport PR to release-v1.2.0 branch from master branch when label is set on PR Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2019-09-26 07:40:04 +00:00
conditions:
- base=master
- label=backport-to-release-v1.2.0
actions:
backport:
branches:
- release-v1.2.0
Add mergify rule to auto merge backported PR Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2019-09-27 08:20:12 +00:00
# automerge backports if CI successfully ran
- name: automerge backport release-v1.2.0
conditions:
- author=mergify[bot]
- base=release-v1.2.0
- label!=DNM
- "#changes-requested-reviews-by=0"
- "#approved-reviews-by>=1"
- "status-success=continuous-integration/travis-ci/pr"
actions:
merge:
method: rebase
rebase_fallback: merge
strict: smart
dismiss_reviews: {}
delete_head_branch: {}
Update mergify to release-v2.0 Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-01-20 11:05:47 +00:00
- name: backport patches to release-v2.0 branch
conditions:
- base=master
- label=backport-to-release-v2.0
actions:
backport:
branches:
- release-v2.0
# automerge backports if CI successfully ran
- name: automerge backport release-v2.0
conditions:
- author=mergify[bot]
- base=release-v2.0
- label!=DNM
- "#changes-requested-reviews-by=0"
- "#approved-reviews-by>=1"
- "status-success=continuous-integration/travis-ci/pr"
actions:
merge:
method: rebase
rebase_fallback: merge
strict: smart
dismiss_reviews: {}
delete_head_branch: {}
Update Mergify for v2.1.0 backports Updated Mergify rules for backporting PR's to release-v2.1 branch and to auto merge the PR if author is mergify bot Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-04-15 02:31:15 +00:00
- name: backport patches to release-v2.1 branch
conditions:
- base=master
- label=backport-to-release-v2.1
actions:
backport:
branches:
- release-v2.1
# automerge backports if CI successfully ran
- name: automerge backport release-v2.1
conditions:
- author=mergify[bot]
- base=release-v2.1
- label!=DNM
- "#changes-requested-reviews-by=0"
- "#approved-reviews-by>=1"
- "status-success=continuous-integration/travis-ci/pr"
actions:
merge:
method: rebase
rebase_fallback: merge
strict: smart
dismiss_reviews: {}
delete_head_branch: {}
ci: automatically merge PRs in ci/centos Merge PRs for the ci/centos branch when they have sufficient approvals and the tests have passed. Using the same rules as the master branch. Signed-off-by: Niels de Vos <ndevos@redhat.com>
2020-05-27 09:43:08 +00:00
- name: remove outdated approvals on ci/centos
conditions:
- base=ci/centos
actions:
dismiss_reviews:
approved: true
changes_requested: false
- name: automatic merge on ci/centos
conditions:
- label!=DNM
- base=ci/centos
- "#approved-reviews-by>=2"
- "#changes-requested-reviews-by=0"
- "status-success=ci/centos/job-validation"
- "status-success=DCO"
- "status-success=commitlint"
actions:
merge:
method: rebase
rebase_fallback: merge
strict: smart
dismiss_reviews: {}
delete_head_branch: {}
- name: automatic merge PR having ready-to-merge label on ci/centos
conditions:
- label!=DNM
- label=ready-to-merge
- base=ci/centos
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- "status-success=ci/centos/job-validation"
- "status-success=DCO"
- "status-success=commitlint"
actions:
merge:
method: rebase
rebase_fallback: merge
strict: smart
dismiss_reviews: {}
delete_head_branch: {}
Reference in New Issue Copy Permalink