Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: automatically add ok-to-test to PRs created by Mergify #3797

Merged
merged 1 commit into from
May 8, 2023

Conversation

nixpanic
Copy link
Member

@nixpanic nixpanic commented May 4, 2023

Mergify does not automatically rebase PRs that are queued for merging (anymore?). Instead, it creates a new draft PR that is expected to get tested by the CI. At the moment someone needs to add the ok-to-test label to the PR. This is cumbersome and can cause delays in the merge process.

The configuration for Mergify now includes a rule that any PR created by Mergify, will automatically get the ok-to-test label. This should make it easier to get PR merged.

See-also: #3796


Show available bot commands

These commands are normally not required, but in case of issues, leave any of
the following bot commands in an otherwise empty comment in this PR:

  • /retest ci/centos/<job-name>: retest the <job-name> after unrelated
    failure (please report the failure too!)
  • /retest all: run this in case the CentOS CI failed to start/report any test
    progress or results

@nixpanic nixpanic added ci/skip/e2e skip running e2e CI jobs ci/skip/multi-arch-build skip building on multiple architectures labels May 4, 2023
@nixpanic nixpanic requested a review from a team May 4, 2023 15:44
@mergify mergify bot added component/testing Additional test cases or CI work Repo activity Process/activites on ceph-csi repo labels May 4, 2023
Mergify does not automatically rebase PRs that are queued for merging
(anymore?). Instead, it creates a new draft PR that is expected to get
tested by the CI. At the moment someone needs to add the `ok-to-test`
label to the PR. This is cumbersome and can cause delays in the merge
process.

The configuration for Mergify now includes a rule that any PR created by
Mergify, will automatically get the `ok-to-test` label. This should make
it easier to get PR merged.

See-also: ceph#3796
Signed-off-by: Niels de Vos <ndevos@ibm.com>
conditions:
- base~=^(devel)|(release-.+)$
- "check-pending=Queue: Embarked in merge train"
- author=mergify
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- author=mergify
- or:
- author=mergify
- "check-pending=Queue: Embarked in merge train"

I think we need one of either checks to pass for adding ok-to-test?

The second check is still required for upto date pr with only one pr in queue / the original pr even if mergifyio does speculative checks ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 2nd check would not need to add the ok-to-test label if the PR is up to date. The Queue: Embarked in merge train message only appears when all required CI jobs have passed.

@nixpanic nixpanic requested a review from Rakshith-R May 8, 2023 07:29
@nixpanic nixpanic merged commit c4d372e into ceph:devel May 8, 2023
12 checks passed
@nixpanic nixpanic deleted the mergify/merge-queue branch May 8, 2023 12:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci/skip/e2e skip running e2e CI jobs ci/skip/multi-arch-build skip building on multiple architectures component/testing Additional test cases or CI work Repo activity Process/activites on ceph-csi repo
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants