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

logictest: skip MR configs under race outside ccl #139299

Merged
merged 1 commit into from
Jan 17, 2025

Conversation

yuzefovich
Copy link
Member

This commit skips under race a couple of MR logic tests that don't live under the ccl folder. We've seen these time out a few times.

Fixes: #138035.

Release note: None

This commit skips under race a couple of MR logic tests that don't live
under the ccl folder. We've seen these time out a few times.

Release note: None
@yuzefovich yuzefovich added backport-23.2.x Flags PRs that need to be backported to 23.2. backport-24.1.x Flags PRs that need to be backported to 24.1. backport-24.2.x Flags PRs that need to be backported to 24.2 backport-24.3.x Flags PRs that need to be backported to 24.3 backport-25.1.x Flags PRs that need to be backported to 25.1 labels Jan 17, 2025
@yuzefovich yuzefovich requested review from rickystewart and a team January 17, 2025 05:52
@yuzefovich yuzefovich requested a review from a team as a code owner January 17, 2025 05:52
@yuzefovich yuzefovich requested review from michae2 and removed request for a team January 17, 2025 05:52
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Collaborator

@michae2 michae2 left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 4 of 4 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @rickystewart)

@yuzefovich
Copy link
Member Author

TFTR!

bors r+

@craig craig bot merged commit b9207a9 into cockroachdb:master Jan 17, 2025
22 checks passed
Copy link

blathers-crl bot commented Jan 17, 2025

Based on the specified backports for this PR, I applied new labels to the following linked issue(s). Please adjust the labels as needed to match the branches actually affected by the issue(s), including adding any known older branches.


Issue #138035: branch-release-23.2, branch-release-24.1, branch-release-24.2, branch-release-24.3, branch-release-25.1.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

Copy link

blathers-crl bot commented Jan 17, 2025

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from ef91868 to blathers/backport-release-23.2-139299: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.2.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@yuzefovich yuzefovich deleted the mr-race branch January 17, 2025 21:26
@yuzefovich yuzefovich removed the backport-23.2.x Flags PRs that need to be backported to 23.2. label Jan 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-24.1.x Flags PRs that need to be backported to 24.1. backport-24.2.x Flags PRs that need to be backported to 24.2 backport-24.3.x Flags PRs that need to be backported to 24.3 backport-25.1.x Flags PRs that need to be backported to 25.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

logictest: MR config timed out under race
3 participants