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,compose: build libgeos for compose tests #123971

Merged
merged 1 commit into from May 13, 2024

Conversation

rafiss
Copy link
Collaborator

@rafiss rafiss commented May 10, 2024

This also includes some changes that make the test easier to debug by adding more logging.

fixes #122079
fixes #121592
fixes #121531
fixes #122339
Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@rafiss rafiss marked this pull request as ready for review May 10, 2024 20:56
@rafiss rafiss requested review from a team as code owners May 10, 2024 20:56
build/teamcity/cockroach/nightlies/compose.sh Outdated Show resolved Hide resolved
pkg/cmd/dev/compose.go Outdated Show resolved Hide resolved
pkg/compose/compose_test.go Outdated Show resolved Hide resolved
pkg/compose/compose_test.go Outdated Show resolved Hide resolved
pkg/compose/compose_test.go Outdated Show resolved Hide resolved
test:
# We use a docker image mirror to avoid pulling from 3rd party repos, which sometimes have reliability issues.
# See https://cockroachlabs.atlassian.net/wiki/spaces/devinf/pages/3462594561/Docker+image+sync for the details.
image: us-east1-docker.pkg.dev/crl-docker-sync/docker-mirror/docker.io/library/ubuntu:xenial-20170214
environment:
- COCKROACH_DEV_LICENSE=$COCKROACH_DEV_LICENSE
- COCKROACH_RUN_COMPOSE_COMPARE=${COCKROACH_RUN_COMPOSE_COMPARE}
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I am unsure how these tests were running at all before this change. Do you know @rickystewart?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Ah, it looks like this is something I missed in 156d9c9c9050df77f38db04a0187503e2edf5cbe. So the thing has been effectively skipped since last week. Thanks for catching this.

Copy link
Collaborator

Choose a reason for hiding this comment

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

That means this has to be backported to release-24.1.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I was planning to backport anyway, since the "missing libgeos library" error is/was happening on all active branches

Copy link
Collaborator

Choose a reason for hiding this comment

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

This change won't backport cleanly to release-23.2 or prior, the basic idea should still apply though.

pkg/cmd/dev/compose.go Outdated Show resolved Hide resolved
build/teamcity/cockroach/nightlies/compose.sh Outdated Show resolved Hide resolved
pkg/compose/compose_test.go Outdated Show resolved Hide resolved
@rafiss rafiss force-pushed the fix-compose-libgeos branch 4 times, most recently from 26d61a1 to fcfcb85 Compare May 10, 2024 22:45
@rafiss rafiss requested a review from rickystewart May 13, 2024 17:18
@rafiss
Copy link
Collaborator Author

rafiss commented May 13, 2024

TFTR!

I was able to test the dev, docker_compose.yml, and compose_test.go changes. But I'm not sure how to manually test that the update to nightlies/compose.sh did what I expected.

I guess I can try trigger a build from this PR's branch like this (?): https://teamcity.cockroachdb.com/buildConfiguration/Cockroach_Nightlies_ComposeTestsBazel/15245803?hideProblemsFromDependencies=false&hideTestsFromDependencies=false

@rafiss
Copy link
Collaborator Author

rafiss commented May 13, 2024

bors r+

@craig craig bot merged commit 337e5d3 into cockroachdb:master May 13, 2024
21 of 22 checks passed
@rafiss
Copy link
Collaborator Author

rafiss commented May 13, 2024

blathers backport 24.1 23.2 23.1

Copy link

blathers-crl bot commented May 13, 2024

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 setting reviewers, but backport branch blathers/backport-release-24.1-123971 is ready: POST https://api.github.com/repos/cockroachdb/cockroach/pulls/124062/requested_reviewers: 422 Reviews may only be requested from collaborators. One or more of the teams you specified is not a collaborator of the cockroachdb/cockroach repository. []

Backport to branch 24.1 failed. See errors above.


error creating merge commit from 8cd7566 to blathers/backport-release-23.2-123971: 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 23.2 failed. See errors above.


error creating merge commit from 8cd7566 to blathers/backport-release-23.1-123971: 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 23.1 failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

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