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: use artifacts/cockroach if possible #141367

Merged
merged 1 commit into from
Feb 18, 2025

Conversation

dt
Copy link
Member

@dt dt commented Feb 12, 2025

This prepends PWD/artifacts to the paths searched for roachtest's required binaries, as this is where a binary built by dev cross, for use in a roachtest, is placed by default.

Additionally, if the binary in found before searching paths, i.e. the one directly in PWD, fails the arch check, we now fall through to the searching and validation step rather than failing immediately; having an invalid-arch binary in PWD is common and expected for CRL engineers working on Darwin/arm, so we should not be surprised to see it and instead just move on to search for a valid one.

Release note: none.
Epic: none.

This prepends PWD/artifacts to the paths searched for roachtest's required binaries, as
this is where a binary built by dev cross, for use in a roachtest, is placed by default.

Additionally, if the binary in found before searching paths, i.e. the one directly in
PWD, fails the arch check, we now fall through to the searching and validation step
rather than failing immediately; having an invalid-arch binary in PWD is common and
expected for CRL engineers working on Darwin/arm, so we should not be surprised to see
it and instead just move on to search for a valid one.

Release note: none.
Epic: none.
@dt dt requested a review from srosenberg February 12, 2025 14:35
@dt dt requested a review from a team as a code owner February 12, 2025 14:35
@dt dt requested review from golgeek and removed request for a team February 12, 2025 14:35
@dt dt changed the title roachtest: use artfacts/cockroach if possible roachtest: use artifacts/cockroach if possible Feb 12, 2025
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@srosenberg
Copy link
Member

Sanity check since we don't have good test coverage for finding the right binary...

SELECT_PROBABILITY=0.10

Feel free to bors after the sanity check.

@dt
Copy link
Member Author

dt commented Feb 18, 2025

Thanks, sanity check seems to have succeeded with two tests failing due to vm preemptions.

TFTR!

bors r+

@craig craig bot merged commit 32f7ef2 into cockroachdb:master Feb 18, 2025
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants