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 tpchvec/smithcmp #67543

Merged
merged 1 commit into from
Jul 13, 2021
Merged

Conversation

yuzefovich
Copy link
Member

The config file has recently been moved to a different location, and
tpchvec/smithcmp test was broken. This is now fixed.

Fixes: #67353.
Fixes: #67361.

Release note: None

The config file has recently been moved to a different location, and
`tpchvec/smithcmp` test was broken. This is now fixed.

Release note: None
@yuzefovich yuzefovich requested review from tbg and a team July 13, 2021 16:49
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@yuzefovich
Copy link
Member Author

TFTR!

bors r+

@craig
Copy link
Contributor

craig bot commented Jul 13, 2021

Build succeeded:

@craig craig bot merged commit 706f0d2 into cockroachdb:master Jul 13, 2021
@blathers-crl
Copy link

blathers-crl bot commented Jul 13, 2021

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 a5e24fb to blathers/backport-release-21.1-67543: 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.1.x failed. See errors above.


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

@yuzefovich
Copy link
Member Author

@otan @jordanlewis for some reason blathers couldn't open the backport PR, but when I did it manually, there was no merge conflict. I don't think it's expected, is it?

@jordanlewis

This comment has been minimized.

@blathers-crl

This comment has been minimized.

@jordanlewis
Copy link
Member

blathers backport 21.1

@blathers-crl
Copy link

blathers-crl bot commented Jul 13, 2021

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 a5e24fb to blathers/backport-release-21.1-67543: 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.1 failed. See errors above.


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

@jordanlewis
Copy link
Member

No, it's not expected.

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: tpchvec/smithcmp failed roachtest: tpchvec/smithcmp failed
4 participants