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 up mockgen usage w/ Bazel #72098

Merged
merged 1 commit into from
Oct 29, 2021

Conversation

rickystewart
Copy link
Collaborator

We were pointing to the checked-in generated files in the Bazel build
here; instead, use gomock.

Also clean up the EXISTING_GO_GENERATE_COMMENTS in
build/bazelutil/check.sh.

Release note: None

@rickystewart rickystewart requested a review from rail October 28, 2021 15:39
@rickystewart rickystewart requested review from a team as code owners October 28, 2021 15:39
@rickystewart rickystewart requested review from tbg and removed request for a team October 28, 2021 15:39
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@tbg
Copy link
Member

tbg commented Oct 29, 2021

I would review this, but have very little experience with bazel, and so my approval wouldn't amount to much.

@tbg tbg requested review from irfansharif and removed request for tbg October 29, 2021 11:06
pkg/cmd/roachtest/tests/BUILD.bazel Outdated Show resolved Hide resolved
@blathers-crl blathers-crl bot requested a review from irfansharif October 29, 2021 18:14
@rickystewart rickystewart force-pushed the roachtest_mocks branch 3 times, most recently from 51bde41 to 1ffe6b5 Compare October 29, 2021 19:57
importpath = "github.com/cockroachdb/cockroach/pkg/cmd/roachtest/prometheus",
visibility = ["//visibility:public"],
deps = [
"@com_github_golang_mock//gomock", # keep
Copy link
Contributor

Choose a reason for hiding this comment

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

[nit] Is the keep necessary?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It is not :)

We were pointing to the checked-in generated files in the Bazel build
here; instead, use `gomock`.

Also clean up the `EXISTING_GO_GENERATE_COMMENTS` in
`build/bazelutil/check.sh`.

Release note: None
@rickystewart
Copy link
Collaborator Author

bors r=irfansharif

@craig
Copy link
Contributor

craig bot commented Oct 29, 2021

Build succeeded:

@craig craig bot merged commit db229ca into cockroachdb:master Oct 29, 2021
craig bot pushed a commit that referenced this pull request Nov 1, 2021
72099: bazel: glob-exclude all *_generated.go files from Gazelle r=rail a=rickystewart

This review is only for the second commit in the stack; the other is from #72098.

This will help ensure that Gazelle doesn't accidentally reference
checked-in generated code.

The generated code in `pkg/col/colserde/arrowserde` is made by `flatc`,
the FlatBuffers compiler -- I tried to make a `genrule` to generate this
code but the code that `flatc` generates now doesn't match up to what's
checked in (maybe we used a different version of `flatc` for the
original version of the code?)

Closes #72096.

Release note: None

72125: dev: pad internal timeouts when under --stress --timeout r=irfansharif a=irfansharif

I was seeing the earlier one second buffer being insufficient.

Release note: None

72264: Move metric scope library r=miretskiy a=miretskiy

This is move only PR which moves metrics scope library from
cdcutils directly under changefeedccl.

It is structured as add/remove PR so that the "add" portion can be easily backported.

Release Notes: None

Co-authored-by: Ricky Stewart <[email protected]>
Co-authored-by: irfan sharif <[email protected]>
Co-authored-by: Yevgeniy Miretskiy <[email protected]>
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.

4 participants