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

roachtest: fix gorm test #89772

Merged
merged 1 commit into from
Oct 14, 2022
Merged

roachtest: fix gorm test #89772

merged 1 commit into from
Oct 14, 2022

Conversation

rafiss
Copy link
Collaborator

@rafiss rafiss commented Oct 11, 2022

fixes #89606
fixes #89605
fixes #89729
fixes #89602

This required using the new version and also excluding one of the new test files.

Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

This required using the new version and also excluding one of the new
test files.

Release note: None
Copy link
Collaborator

@ZhouXing19 ZhouXing19 left a comment

Choose a reason for hiding this comment

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

LGTM

@rafiss
Copy link
Collaborator Author

rafiss commented Oct 14, 2022

tftr!

bors r=ZhouXing19

@craig
Copy link
Contributor

craig bot commented Oct 14, 2022

Build succeeded:

@craig craig bot merged commit 4aaf5e9 into cockroachdb:master Oct 14, 2022
@blathers-crl
Copy link

blathers-crl bot commented Oct 14, 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 7722989 to blathers/backport-release-21.2-89772: 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 21.2.x failed. See errors above.


error creating merge commit from 7722989 to blathers/backport-release-22.1-89772: 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.1.x failed. See errors above.


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

@rafiss rafiss deleted the fix-gorm branch October 17, 2022 15:02
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.

roachtest: gorm failed roachtest: gorm failed roachtest: gorm failed roachtest: gorm failed
3 participants