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: skip "integration"-style tests in testrace #87713

Merged
merged 1 commit into from
Sep 9, 2022

Conversation

rickystewart
Copy link
Collaborator

Closes #87700.
Release note: None

@rickystewart rickystewart added the do-not-merge bors won't merge a PR with this label. label Sep 9, 2022
@rickystewart rickystewart requested a review from a team September 9, 2022 15:50
@rickystewart rickystewart requested a review from a team as a code owner September 9, 2022 15:50
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@rickystewart rickystewart added backport-22.2.x and removed do-not-merge bors won't merge a PR with this label. labels Sep 9, 2022
@rickystewart rickystewart requested review from knz and healthy-pod and removed request for a team September 9, 2022 15:58
@rickystewart
Copy link
Collaborator Author

bors r=knz

@craig
Copy link
Contributor

craig bot commented Sep 9, 2022

Build succeeded:

@craig craig bot merged commit be989ac into cockroachdb:master Sep 9, 2022
@blathers-crl
Copy link

blathers-crl bot commented Sep 9, 2022

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 e572dce to blathers/backport-release-22.2-87713: 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 22.2.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan.

@knz
Copy link
Contributor

knz commented Sep 10, 2022

This needs a manual backport I think?

@rickystewart
Copy link
Collaborator Author

#88013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

acceptance: TestDocker failing under race
3 participants