considering we have 3.7 release in place, this commit remove
the release 3.5 backporting based on the labels in the repo.
Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
Comment out `comment: ` settings, since it
does not have any options set, otherwise
throws the following error.
```
The current Mergify configuration is invalid
required key not provided @ defaults → actions → comment → message
```
Signed-off-by: Rakshith R <rar@redhat.com>
Updating mergify rules to consider CI run on
Kubernetes 1.24 and discard CI run on kubernetes
1.21 as we no longer need it.
updates: #3086
Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
we already have generic rules to merge the PR's
in devel and release branches with `automatic merge`
rules. Removing the duplicate release-3.5 rule.
Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
"component/nfs" has been added to the labels in the repository, and
Mergify should be able to add that to PRs.
Updates: #2913
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Pull requests are not going to be queued if at the same time the pull
request review are dismiss
Original-author: Mehdi ABAAKOUK <sileht@sileht.net>
Signed-off-by: Niels de Vos <ndevos@redhat.com>
By the addition of the queue rules in the Mrgify configuration, all PRs
that require changes, or have been updated and review should be dropped,
are now added to the queue for merging. This is obviously not what we
want.
Fixes: 43fc945 ("ci: move from merge action to queue action")
Signed-off-by: Niels de Vos <ndevos@redhat.com>
as mentioned in the below blog the support for strict mode
and merge action will be done soon in mergify. This brings
the change requested for the same.
Ref# https://blog.mergify.com/strict-mode-deprecation/
Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
as we added kubernetes 1.23 for mergify, removing
older version i.e 1.20 as we will run tests
only on latest 3 kubernetes releases.
Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
as we are running tests on kubernetes 1.23 by
default, adding mergify condition to check test
passed on kubernetes 1.23 also.
Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
It seems that the matching condition on the modified files with
-files~=^(!?actions/)
validates to 'true' when that is not intended. The example in the
Mergify documentation does not seem to be correct :-/
This reverts commit 411bf33a3d.
See-also: https://docs.mergify.com/examples/#merging-based-on-modified-files
Signed-off-by: Niels de Vos <ndevos@redhat.com>
PRs that contain `mergify` or `Mergify` in the subject should both match
the rule to add labels. The regular expressions can include `(?i)` to
make the matching case-insensitive.
See-also: https://docs.mergify.com/configuration/#regular-expressions
Signed-off-by: Niels de Vos <ndevos@redhat.com>
The matching checks the list of modified files, and if it does not
contain anything outside the `actions/` directory, the labels are
applied.
Actions are not tested with e2e, so changes can be labelled to skip
these time and resource intensive tests.
Signed-off-by: Niels de Vos <ndevos@redhat.com>
There is no use in having Mergify posting messages to Dependabot and
asking for resolving of merge conflicts. Dependabot will try to do that
automatically, and posts a message when some other action is needed.
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Dependabot creates commit messages that commitlint fails to parse
correctly. The messages contain simple references to which dependencies
are updated, and do not need full validation like manual written
messages do.
Signed-off-by: Niels de Vos <ndevos@redhat.com>
CSI version v3.3.0 and above are the supported versions now and this
patch also adjust the mergify rules according to that, ie the backport
rules are removed for all unsupported versions here.
Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
updated mergify rules to consider the teams
approval to merge a PR.
more details at #2367fixes#2367
Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
As kubernetes v1.19 is heading towards its EOL
on 2021-09-30, run tests on kubernetes v1.22
and require it to pass for merging.
Signed-off-by: Yug Gupta <yuggupta27@gmail.com>
currently PR merging is blocked due to
commitlint issue. disabling commitlint
or the release branches now. more details at
https://github.com/ceph/ceph-csi/pull/2342
Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
The new `backport-to-release-v3.4` label can be added to PRs and Mergify
will create a backport once the PR for the devel branch has been merged.
Signed-off-by: Niels de Vos <ndevos@redhat.com>
As Travis CI `https://travis-ci.org/` is getting
shutdown date on June 15th. Either we need to move
to new place https://www.travis-ci.com/ or we can
switch to github action to push image and the helm
charts when a PR is merged.
fixes: #1781
Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
Mergify.io has removed bot_account from its free open source plan.
This commit removes bot_account option from comment, merge and rebase
actions default and documenting the implications going forward.
Signed-off-by: Rakshith R <rar@redhat.com>
Quite a few PRs have the `build:` prefix. It would be good to teach
Mergify to set the label for those.
Signed-off-by: Niels de Vos <ndevos@redhat.com>
When the configuration for Mergify itself gets updated, there is not
need to run the e2e tests.
It seems that the `(ci)` part of matching a title for ci/testing PRs
would match partial words like 'capacity'. This is not intended, so
rephrasing the regex and adding `e2e` as match too.
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Adding labels to Pull-Requests can be done by Mergify. It is very useful
to filter PRs on their labels so that experts in certain areas can
identify PRs to review.
Adding labels is currently a complete manual process, this adds some
automation for it. There is no intention of it being complete, this is
mostly for getting started and trying things out.
Signed-off-by: Niels de Vos <ndevos@redhat.com>
The matching with regexes on the `base=` configuration in Mergify does
not seem to work as intended. Possibly this is due the addtional quotes
around the regex.
Fixes: 8d7c66363 (ci: apply standard Mergify rules for release branches too)
Signed-off-by: Niels de Vos <ndevos@redhat.com>
It is not always possible to automatically backport PRs to release
branches. That also means that these backport PRs are not created by the
mergify[bot] account. Because of this, it is needed to manually merge
PRs, as Mergify refuses to do it.
By changing the `base=` option to match a regular expression that
includes both `devel` and `release-*` branches, Mergify should assist
with merging PRs to release branches too.
Note that the `ci/centos` branch is different, as runs other tests than
the normal branches.
Signed-off-by: Niels de Vos <ndevos@redhat.com>
All backport prs are authored by mergify[bot] not ceph-csi-bot
and there is no support for bot_account to create backport pr
currently.
Fixes: #1994
Signed-off-by: Rakshith R <rar@redhat.com>
as we have a new release-v3.3 branch. adding
the mergify rules for auto merge and auto backport
based on backport-to-release-v3.3 label.
Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
Since github actions cover all the tests covered by
the containerized tests, disabling them in upstream
to avoid running repetitive tests and properly utilize
CI instances.
The test will still be available to run locally.
Signed-off-by: Yug <yuggupta27@gmail.com>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
