Commit Graph

92 Commits

Author SHA1 Message Date
Niels de Vos
6f113aa862 build: move mergify/merge options to defaults section
Signed-off-by: Niels de Vos <ndevos@redhat.com>
2021-03-01 14:16:07 +05:30
Niels de Vos
1fcbbe0fa7 build: use ceph-csi-bot account for mergify actions
Mergify does now support a `defaults:` section. It can be used to
configure the `bot_account:` in a single location.

CC: @ceph-csi-bot
Signed-off-by: Niels de Vos <ndevos@redhat.com>
2021-03-01 14:16:07 +05:30
Niels de Vos
92190dee5d ci: use "devel" branch instead of "master"
Signed-off-by: Niels de Vos <ndevos@redhat.com>
2021-03-01 10:51:30 +05:30
Niels de Vos
90966597b4 ci: require ci/centos/mini-e2e/k8s-1.20 for merging
k8s-1.20 CI jobs seem stable, so there is nothing preventing us from
requiring v1.20 for test results. v1.18 jobs will be removed from the CI
environment, so that version will not be required anymore.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
2020-12-18 12:05:10 +05:30
Madhu Rajanna
72fa77a6d7 ci: add mergify rules for release-v3.2
added mergify rules for backporting and
for auto merging the PR.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-12-08 11:25:16 +01:00
Madhu Rajanna
5cddfc454e ci: update mergify rules for github actions
as we have added new github actions for the
static checks in #1762. This commits adds
the mergify rules for those github actions.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-12-07 10:48:53 +01:00
Madhu Rajanna
55974973e6 ci: update mergify rule for multi arch build
updated mergify rules for multi-arch build

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-12-01 20:14:31 +05:30
Madhu Rajanna
591d097320 ci: update mergify rule for codespell
added codespell as required to auto merge PR.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-11-30 08:46:48 +01:00
Niels de Vos
6e3d68f575 ci: use major Kubernetes versions again for Mergify checks
With the update to minikube v1.14.1 downloading binaries for the recent
Kubernetes patch releases works again. The CI jobs have been updated to
use the major versions, and so should Mergify.

Fixes: #1588
Signed-off-by: Niels de Vos <ndevos@redhat.com>
2020-10-27 19:35:02 +05:30
Madhu Rajanna
01c02b5c02 ci: update mergify rules for auto merge
currently, auto merge is not checking for the
centos CI status before merging the PR, this commit
adds the check for the same.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-10-19 16:35:20 +05:30
Madhu Rajanna
b25923166b ci: remove extra travis CI rule
Travis CI rule is added twice in the mergify,
removed the same.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-10-19 16:35:20 +05:30
Madhu Rajanna
a128aa430b ci: update mergify rules for E2E on kubernetes 1.18.9
The latest Kubernetes patch release (v1.18.10) can not be deployed with
minikube. Selecting version 1.18.9 until the problems with minikube are
addressed.

https://github.com/ceph/ceph-csi/pull/1596 updated
the kubernetes version for E2E
Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-10-19 12:48:07 +05:30
Niels de Vos
6312dbd920 ci: use Kubernetes 1.19.2 to merge PRs
The latest Kubernetes patch release (v1.19.3) can not be deployed with
minikube. Selecting version 1.19.2 until the problems with minikube are
addressed.

Updates: #1588
Signed-off-by: Niels de Vos <ndevos@redhat.com>
2020-10-15 16:37:23 +05:30
Yug
ca7a87c0a3 ci: require upgrade tests to pass for merging
Add passing of upgrade tests as a necessary condition
for merging PRs.

Signed-off-by: Yug <yuggupta27@gmail.com>
2020-10-01 12:52:55 +05:30
Niels de Vos
409b12e4ee ci: drop Kubernetes patch version from conditions
With the improvements from #1480 there is no need to specify the full
Kubernetes versions anymore, the major version is sufficient now.

See-also: #1480
Signed-off-by: Niels de Vos <ndevos@redhat.com>
2020-09-15 17:17:32 +05:30
Madhu Rajanna
4b435d9a12 ci: update mergify rules for e2e tests
as we have added v1.19.0 in CI for E2E tests and also
removed the v1.17.x from CI updating the mergify rules
for the same.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-09-15 16:43:20 +05:30
Niels de Vos
b66390ee06 ci: do not require commitlint before merging
The GitHub commitlint App does not get triggered for new or updated PRs
since the last days. It is possible to manually start a test in the
CentOS CI for this with `/test commitlint`, but Travis CI already
includes a test (as part of "static-checks") too. There is no need to
run the tests 2x, so remove the status check from the Mergify
configuration.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
2020-08-19 13:45:40 +05:30
Niels de Vos
25899b0123 ci: do not constantly rebase PRs
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>
2020-08-17 16:23:12 +05:30
Niels de Vos
b881ef1eee ci: prevent Mergify from doing merge commits
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>
2020-08-17 16:23:12 +05:30
Niels de Vos
aa5b53fcce ci: use ceph-csi-bot account for merging PRs
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>
2020-08-17 08:30:26 +05:30
Madhu Rajanna
738b5a1f46 ci: add mergify rules for v3.1 branch
add mergify rules for backport and auto
merge of PR's for release-v3.1 branch.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-08-17 08:30:00 +05:30
Madhu Rajanna
d8df06e3d8 ci: update mergify rules for centos ci
Updated mergify rules for auto merging the PR
in master branch.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-08-06 13:36:43 +05:30
Madhu Rajanna
66a0b0953e ci: update mergify rules for v3.0
updated mergify rules for auto backport
and merging for release-v3.0 branch.
Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-07-27 11:29:20 +05:30
Niels de Vos
6df6cbd9e0 ci: require jjb-validate job to succeed for ci/centos branch
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>
2020-07-25 08:39:01 +05:30
Yug
be8d3b6047 ci: enable containerized test job in mergify
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>
2020-07-20 14:15:47 +05:30
Humble Chirammal
285028727a 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 20:10:34 +05:30
Niels de Vos
ea3d9e941f 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-28 12:27:44 +05:30
Niels de Vos
3d0395d448 ci: require ci/centos/containerized-tests for merging
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>
2020-05-27 12:59:05 +05:30
Madhu Rajanna
d55dc6de92 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-21 13:32:51 +05:30
Madhu Rajanna
78267692fc 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-20 14:27:33 +05:30
Madhu Rajanna
ea33ccdb1a 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 21:11:13 +05:30
Madhu Rajanna
a3d2980311 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 13:00:22 +05:30
Madhu Rajanna
50a84fb930 Update mergify to release-v2.0
Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2020-01-20 17:33:03 +05:30
Madhu Rajanna
3784268dde update mergify for auto merging
update rules to auto merge in master branch

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2019-09-30 17:19:00 +05:30
Madhu Rajanna
0b261e2819 if there are changes requested dont merge PR
Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2019-09-27 16:11:33 +05:30
Madhu Rajanna
ed364cf6ea 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 16:11:33 +05:30
Madhu Rajanna
136d81b736 Add mergify rule to auto merge backported PR
Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2019-09-27 16:11:33 +05:30
Madhu Rajanna
ceef9ff3a5 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-27 09:50:59 +05:30
Niels de Vos
2192d40937 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-03 14:29:40 +02:00
Humble Chirammal
776cb3cdbc Default to 2 approvals for a patch to get in.
Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
2019-04-04 07:38:02 +00:00
Madhu Rajanna
593b357e1d Fix yaml lint error in mergify
Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
2019-03-22 10:57:56 +05:30
Sébastien Han
6e7373cd38 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-03-19 21:00:39 -04:00