Commit Graph
50 Commits
Author SHA1 Message Date
Travis Nielsen f225f9a34d ci: fix mergify auto merge test names
The test names must match exactly for the mergify
auto merge to complete successfully. Update two of
the test names to match the latest CI.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
(cherry picked from commit 83b017994e)
2024-04-04 20:32:30 +00:00
Blaine Gardner 3e76de7868 ci: allow canary jobs to have ids for nightly suite
For nightly jobs, canary tests are all running with the same job IDs,
making the last-run jobs cancel previous runs. Add a workflow-id
parameter to canary jobs that can be used to give each job in a canary
suite a unique job ID to prevent this.

Signed-off-by: Blaine Gardner <blaine.gardner@ibm.com>
2024-02-14 11:04:40 -07:00
subhamkrai 54b3c9f79f ci: upgrade kubernetes version to latest version
Signed-off-by: subhamkrai <srai@redhat.com>
2023-12-15 12:11:51 +05:30
travisn ec2136a507 ci: mergify rules for 1.13
Add mergify rules for opening backport PRs to the release-1.13
branch and also for auto-merging backports after the CI
passes.

Signed-off-by: travisn <tnielsen@redhat.com>
2023-12-01 15:09:10 -07:00
subhamkrai 62fa21063c ci: update mergify to have latest k8s version
updating .mergify backport for 1.12 branch
to include latest version of k8s v1.28.0 and
latest golang version v1.21.0

Signed-off-by: subhamkrai <srai@redhat.com>
2023-08-31 10:01:37 +05:30
travisn 57703deb6c ci: enable mergify for the 1.12 branch
For the new release-1.12 branch, mergify rules are added
for automatically opening PRs and merging backports
when approved.

Signed-off-by: travisn <tnielsen@redhat.com>
2023-07-07 12:30:39 -06:00
travisn 05bebc1615 ci: require go 1.20 in the builds
To update to the latest go modules we need to restrict golang
support to 1.20 for now.

Signed-off-by: travisn <tnielsen@redhat.com>
2023-06-22 16:37:10 -06:00
Travis Nielsen 968fbcd818 ci: skip requirement for mirroring test in backports
The multi-cluster-mirroring test is consistently failing.
Any failing tests will prevent mergify from merging the
backport PRs automatically, so we disable this until
that test passes.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2023-02-23 09:11:21 -07:00
Travis Nielsen 395a6750c0 ci: update mergify for the new 1.11 branch
Add the mergify settings so backports can be automated
to the release-1.11 branch and automatically merged
after the CI is green.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2023-02-15 15:23:18 -07:00
Travis Nielsen eab01f8821 bot: fix automerge for 1.10 backports
The success of all the CI actions must exactly match the
list for the mergify config. The config was missing a
paren, so the merges were not happening automatically.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2022-09-06 11:27:42 -06:00
Travis Nielsen a6dfb77827 build: update min version to k8s 1.19
Rook will support the most recent seven K8s releases,
so we update the min version to 1.19 for Rook v1.10.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2022-08-30 15:15:20 -06:00
Travis Nielsen eaa3822a63 build: update mergify for the release-1.10 branch
Configure the mergify bot to open backport PRs for the
1.10 release branch if PRs are labeled as such.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2022-08-19 12:52:36 -06:00
subhamkrai f05b6dc307 ci: update doc link in ci
Signed-off-by: subhamkrai <srai@redhat.com>
2022-05-31 16:50:03 +05:30
Travis Nielsen d26b6cf403 build: update min version to k8s 1.17
Support is removed for k8s for various limitations such as
priority classes not working and csi driver feature
incompleteness and missing snapshots. Documentation is updated
with the new min version of k8s 1.17 and also the tests are
updated to run on the min version of 1.17.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2022-04-25 15:32:09 -06:00
Travis Nielsen 5381a6ee2a build: remove requirement for ibm test in backports
The ibm test is not expected to run in PRs, so we can
remove it from the list of required tests for backports in the
release-1.9 branch.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2022-04-13 10:13:00 -06:00
Travis Nielsen bc5013e487 build: remove auto merge rules for master branch
The rules for auto merging PRs from master have not been used.
Instead we follow a pattern of a maintainer deciding when is
the best time to merge the PR in case it is not ready even after
being approved.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2022-04-01 10:48:34 -06:00
Travis Nielsen 74cfe4549a build: add new ci checks to auto v1.9 merge rules
Several new CI checks have been added recently, so we add
them as auto-merge rules for mergify.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2022-04-01 10:46:51 -06:00
Travis Nielsen 42c7b7f6b3 build: add mergify rules for release-1.9
With the creation of the release-1.9 branch, the mergify
rules are updated for the new branch.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2022-04-01 09:10:07 -06:00
Travis Nielsen 27ba1467cd bot: mergify deprected the strict merge option
The strict merge option was not being used and anyway
has been depcrecated by the mergify bot.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2021-12-06 15:10:00 -07:00
Travis Nielsen f7b9ca966e bot: enable backports to release-1.8
With the creation of the release-1.8 branch we enable
the mergify bot to open the backport PRs automatically
based on the backport-release-1.8 label.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2021-12-02 11:51:57 -07:00
Sébastien Han c2d36c3343 bot: add bot message when pushing on a release branch
Normally, only the mergify bot should send out PR to the release
branches. All contributions should generally go in master first then be
backported. Let's warn to avoid merging PR send against a release
branch.

Signed-off-by: Sébastien Han <seb@redhat.com>
2021-11-25 18:51:38 +01:00
Blaine Gardner 010addaf5d bot: add more commitlint tags, remove ceph
Remove the unspecific 'ceph' tag, and add a few other specific tags:
  block (for block storage that is not pool-specific)
  file (for file storage that is not mds-specific)
  monitoring (for prometheus, etc.)
  nfs (for CephNFS and nfs-ganesha)
  object (for object storage that is not rgw-specific)

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
2021-10-20 10:44:09 -06:00
Sébastien Han cc66fdb5d7 bot: fix mergify merge rules for kubernetes version
CI's running versions were incorrect.

Closes: https://github.com/rook/rook/issues/8865
Signed-off-by: Sébastien Han <seb@redhat.com>
2021-09-29 10:17:29 +02:00
Sébastien Han 8902d7095e bot: remove old branch config from mergify
We don't backport to 1.4 or 1.5 anymore so let's clean up the file.

Signed-off-by: Sébastien Han <seb@redhat.com>
2021-09-29 10:08:11 +02:00
Travis Nielsen f5c1543ddf build: update min k8s version to 1.16
In Rook v1.8 the min version of K8s supported is updated to 1.16.
Users running on older versions of K8s are recommended to update
to 1.16 or newer before updating to Rook v1.8.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2021-09-23 16:17:56 -06:00
Travis Nielsen 0591753673 docs: update master doc links to latest
With the renaming of master docs to latest, all the links also
need to be updated.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2021-09-22 12:41:32 -06:00
Blaine Gardner c60bf241e1 test: make object e2e test its own test
The CephSmokeSuite is becoming quite large and long, and most of the
length is now related to the object e2e tests. Separate the full object
e2e test into CephObjectSuite, and only test the object 'lite' test in
the CephSmokeSuite.

Resolves #8714

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
2021-09-17 15:27:27 -06:00
Blaine Gardner e684fa09e7 bot: remove NFS and Cassandra mergify/commitlint cfg
Remove NFS and Cassandra references from mergify and commitlint configs.

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
2021-08-31 14:05:34 -06:00
Travis Nielsen 3f3c97a586 build: auto add the nfs label based on the pr title
The cassandra and ceph PRs already had the label added automatically,
now the nfs PRs will also have a label added.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2021-07-23 15:57:13 -06:00
Travis Nielsen 27a2b468ba build: add mergify backport for 1.7 and remove 1.3 support
The mergify bot now has rules for backporting to the release-1.7
branch. Backporting to 1.3 is no longer needed, so we can remove
that backport rule.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2021-07-23 15:55:59 -06:00
Sébastien Han 18b1477352 ci: remove jenkins from master branch
Thank you Jenkins for all those years, but it's to retire.

Signed-off-by: Sébastien Han <seb@redhat.com>
2021-06-10 15:34:15 +02:00
Sébastien Han 05848dd34a bot: set the correct k8s version for mergify auto-merge on 1.6
In the release-1.6 branch, the k8s versions are different, we run
v1.20.2 where the master branch runs v1.21.0.

Signed-off-by: Sébastien Han <seb@redhat.com>
2021-04-20 11:07:11 +02:00
Sébastien Han 8c95ac2880 bot: auto-label cassandra pull requests
Just like ceph if a PR title starts with "cassandra" let's add the
"cassandra" label to it.

Signed-off-by: Sébastien Han <seb@redhat.com>
2021-04-19 12:41:47 +02:00
Travis Nielsen bfa302f2c2 ci: run integration tests on k8s 1.21
With the release of K8s 1.21.0 we now run the integration tests
on v1.21.0. To keep consistent with running master builds on five
recent releases, we keep master builds back to v1.15 and skip other
less changed versions such as v1.16 and 1.19. Jenkins builds just run
five versions, while github actions run four versions.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2021-04-12 13:10:43 -06:00
Sébastien Han 143292ea5a bot: remove jobs that don't exit
For TestCephMultiClusterDeploySuite and TestCephUpgradeSuite we only run
on a single k8s version.

Signed-off-by: Sébastien Han <seb@redhat.com>
2021-04-12 17:37:59 +02:00
Sébastien Han 63b2b0da3d bot: fix mergify auto-merge rule
We need to pass the complete name of the action.

Signed-off-by: Sébastien Han <seb@redhat.com>
2021-04-12 17:08:48 +02:00
Blaine Gardner ef9a889994 bot: auto merge backports to release-1.6
Previously forgot to add mergify rule to auto merge backports to
release-1.6. Backport PRs would still be created but not merged.

Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
2021-04-09 09:48:11 -06:00
Blaine Gardner 706bb0118e bot: auto backport on backport-release-1.6 label
Signed-off-by: Blaine Gardner <blaine.gardner@redhat.com>
2021-04-07 15:13:31 -06:00
Sébastien Han 5c87f0f331 bot: add rule to auto-merge on no code changes
On pull request with no code changes, the canary and integration tests
won't run. This means they won't appear in the status and mergify cannot
validate them.

Signed-off-by: Sébastien Han <seb@redhat.com>
2020-11-16 18:05:11 +01:00
Sébastien Han 841efd1d94 bot: auto-merge pull request under conditions
We now allow mergify to auto-merge pull requests against the master
branch under the following conditions:

* all CI tests passed
* the PR has no label 'do-not-merge'
* the PR has the label 'ready-to-merge'
* has been approved by at least one maintainer
* has not requested changes

Signed-off-by: Sébastien Han <seb@redhat.com>
2020-11-13 10:13:44 +01:00
Sébastien Han 1b45127056 bot: mergify add release 1.5
Update mergify to auto backport PR with label on release 1.5 branch and
auto merge.

Signed-off-by: Sébastien Han <seb@redhat.com>
2020-11-06 08:58:46 +01:00
Sébastien Han 896d721737 bot: mergify remove release-1.2 actions
1.2 is getting old and automatic backport will likely fail anyways.

Signed-off-by: Sébastien Han <seb@redhat.com>
2020-11-06 08:54:50 +01:00
Sébastien Han e6e025f911 bot: add mergify rule for ceph label and reviewer
If a PR has a title that starts with "ceph", the ceph label will be
added as well the reviewers.

Signed-off-by: Sébastien Han <seb@redhat.com>
2020-08-13 16:42:54 +02:00
Travis Nielsen 6302b54c27 ci: add mergify backport target for release-1.4
With the v1.4 release we will need mergify to support
the automatic backports based on the PR label.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2020-07-29 10:03:55 -06:00
Travis Nielsen 4abaaf083c ci: remove 1.1 backport target
There is no longer a need to support backports to v1.1,
so removing the mergify rule.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
2020-07-29 09:55:28 -06:00
Sébastien Han 67a8959e0a mergify: ping user if PR has conflicts
That rule posts a comment as soon as a pull request is in conflict, notifying the pull request author that they need to intervene!

Signed-off-by: Sébastien Han <seb@redhat.com>
2020-05-22 16:49:08 +02:00
Sébastien Han a46c1b3491 mergify: prepare for release-1.3
incoming!

Signed-off-by: Sébastien Han <seb@redhat.com>
2020-03-26 17:34:26 +01:00
Sébastien Han 77af8c6712 mergify: add backport-release-1.2 rules
Add a new rule for the upcoming release-1.2 branch.

Signed-off-by: Sébastien Han <seb@redhat.com>
2019-12-06 18:45:19 +01:00
Sébastien Han e17d22a363 mergify: change config to allow auto-merging
Let's not do a rebase, but only merge. Rook is configured to refuse the
rebase and mergify fails with the following Github error:

GitHub error message: Rebase merges are not allowed on this repository.

This commit fixes the error.

Signed-off-by: Sébastien Han <seb@redhat.com>
2019-10-10 17:29:43 +02:00
Sébastien Han cfd2a7be0b add mergify engine for backport only
This is round 2 attempting to add the mergify engine in Rook. In this
case, we only use the backporting and automerge features.

* auto backport: set a label on your PR and a backport PR will be
automatically created under the right branch
* auto backport PR merge: if the backport PR passes CI, mergify will
merge it.

Signed-off-by: Sébastien Han <seb@redhat.com>
2019-09-25 08:41:41 +02:00