Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
queue_rules:
- name: default
# GitHub branch protection currently injects only github-review-approved.
# Require the Jenkins statuses reported by cephadm-ansible-prs so a PR
# that is already up-to-date cannot skip CI and merge while jobs are pending.
merge_conditions:
- 'check-success="Testing: flake8"'
- 'check-success="Testing: mypy"'
- 'check-success="Testing: unittests"'
- 'check-success="Testing: el9-functional"'
- 'check-success="Testing: el10-functional"'
- label != DNM

pull_request_rules:
- name: backport tentacle
conditions:
Expand Down
4 changes: 3 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ Merging PR is controlled by [mergify](https://mergify.io/) by the following
rules:

- at least one approval from a maintainer
- a SUCCESS from the CI pipeline "cephadm-ansible PR Pipeline"
- SUCCESS from every Jenkins status reported by the cephadm-ansible PR
pipeline (`Testing: flake8`, `Testing: mypy`, `Testing: unittests`,
`Testing: el9-functional`, `Testing: el10-functional`)

If your work is not ready for review and merging, request the `DNM` (**D**o
**N**ot **M**erge) label via a comment or the title of your PR. This will
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
NNODE = 6
NCLIENTS = 2
LABEL_PREFIX = 'ceph-'
MEMORY = 1024
MEMORY = 2048
PUBLIC_SUBNET = '192.168.9'
CLUSTER_SUBNET = '192.168.10'
BOX = ENV['CEPH_ANSIBLE_VAGRANT_BOX']
Expand Down
Loading