It seems the 'rebase' action in Mergify causes each PR to be
automatically rebased once there is a change in the target branch. This
causes a very high load on the CI, which delays other PRs from getting
their test results.
Remove the 'rebase' action, as it does not work as intended. The
expectation was that '@mergifyio rebase' uses the configuration.
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Merge commits cause the CentOS CI commitlint job to fail. By configuring
Mergify to not do merge commits, but rebases before final testing, we
can use the CentOS CI commitlint job when the GitHub commitlint App does
not work.
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Currently the "@mergifyio rebase" commands uses a random person from the
GitHub organization that owns the repository. This is rather confusing
and ugly. With this change, alls rebase/merge actions are done with the
ceph-csi-bot account that also posts the result of jobs in the CentOS CI.
Signed-off-by: Niels de Vos <ndevos@redhat.com>
The jjb-validate job can not be run in parallel, so it may fail when
multiple PRs for the ci/centos branch are sent. However, the ci/centos
branch is not very active, so problems should be minimal.
In case of problems, leave the following comment in the PR and the job
should restart:
/retest ci/centos/jjb-validate
See-also: #1273
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Since containerized-tests job is functioning
again, we can re-enable the job as a required
condition to merge PRs.
Signed-off-by: Yug <yuggupta27@gmail.com>
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>
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>
The ci/centos/containerized-tests status is already set by the Jenkins
job in the CentOS CI. It can now be used to gate the automatic merging
of PRs.
Reduce the load on Travis CI, do not run the containerized-tests job
there any longer.
Signed-off-by: Niels de Vos <ndevos@redhat.com>
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>
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>
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>
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>
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>
