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

build: map in the full teamcity alternates directory #47799

Merged
merged 1 commit into from
Apr 22, 2020

Conversation

petermattis
Copy link
Collaborator

Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable


teamcity_alternates="/home/agent/system/git/"
if test -d "${teamcity_alternates}"; then
vols="${vols} --volume=${teamcity_alternates}:${teamcity_alternates}${cached_volume_mode}"
Copy link
Member

Choose a reason for hiding this comment

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

Could we dirname the result of the previous version? I think that would do the trick without being as TC specific.

Copy link
Member

Choose a reason for hiding this comment

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

So alternates_path=$(dirname $(cat "${alternates_file}"))

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Probably. I'm just looking for the sledgehammer fix here. We can follow-up with a cleaner fix if this PR actually works.

I think we could also look for alternates files in other .git directories.

Copy link
Member

@jordanlewis jordanlewis left a comment

Choose a reason for hiding this comment

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

LGTM

@petermattis
Copy link
Collaborator Author

Some of the roachtest CI tests passed, while previously they had all failed. I'm going to get bors working. We can clean this up tomorrow.

bors r+

@craig
Copy link
Contributor

craig bot commented Apr 22, 2020

Build failed

@petermattis
Copy link
Collaborator Author

Examples-ORMs failure. Hoping it was just a flake.

bors r+

@craig
Copy link
Contributor

craig bot commented Apr 22, 2020

Build succeeded

This was referenced Apr 22, 2020
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.

3 participants