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.

Sign up for GitHub

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: update some configurations for remote build execution #109152

Merged
merged 1 commit into from
Aug 21, 2023
Merged

build: update some configurations for remote build execution #109152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ build:cibase --lintonbuild
# Ref: https://github.com/bazelbuild/rules_go/pull/2456
test:cibase --test_env=GO_TEST_WRAP_TESTV=1
# Dump all output for failed tests to the build log.
test:cibase --test_output=errors
test:ci --test_output=errors
# Put all tmp artifacts in /artifacts/tmp.
test:ci --test_tmpdir=/artifacts/tmp
build:ci --config=cibase
Expand Down
3 changes: 3 additions & 0 deletions pkg/base/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ go_test(
],
args = ["-test.timeout=55s"],
data = glob(["testdata/**"]),
exec_properties = {
"dockerNetwork": "standard",
},
deps = [
":base",
"//pkg/roachpb",
Expand Down
3 changes: 3 additions & 0 deletions pkg/ccl/cloudccl/cloudprivilege/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ go_test(
"privileges_test.go",
],
args = ["-test.timeout=295s"],
exec_properties = {
"dockerNetwork": "standard",
},
tags = ["ccl_test"],
deps = [
"//pkg/base",
Expand Down
3 changes: 3 additions & 0 deletions pkg/ccl/cloudccl/externalconn/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ go_test(
],
args = ["-test.timeout=295s"],
data = glob(["testdata/**"]),
exec_properties = {
"dockerNetwork": "standard",
},
tags = ["ccl_test"],
deps = [
"//pkg/base",
Expand Down
4 changes: 3 additions & 1 deletion pkg/ccl/logictestccl/tests/3node-tenant-multiregion/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ go_test(
"//pkg/sql/logictest:testdata", # keep
"//pkg/sql/opt/exec/execbuilder:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 5,
tags = [
"ccl_test",
Expand Down
4 changes: 3 additions & 1 deletion pkg/ccl/logictestccl/tests/3node-tenant/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ go_test(
"//pkg/sql/logictest:testdata", # keep
"//pkg/sql/opt/exec/execbuilder:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 48,
tags = [
"ccl_test",
Expand Down
4 changes: 3 additions & 1 deletion pkg/ccl/logictestccl/tests/5node/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/ccl/logictestccl:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 5,
tags = [
"ccl_test",
Expand Down
4 changes: 3 additions & 1 deletion pkg/ccl/logictestccl/tests/fakedist-disk/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/ccl/logictestccl:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 5,
tags = [
"ccl_test",
Expand Down
4 changes: 3 additions & 1 deletion pkg/ccl/logictestccl/tests/fakedist-vec-off/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/ccl/logictestccl:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 5,
tags = [
"ccl_test",
Expand Down
4 changes: 3 additions & 1 deletion pkg/ccl/logictestccl/tests/fakedist/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/ccl/logictestccl:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 6,
tags = [
"ccl_test",
Expand Down
4 changes: 3 additions & 1 deletion pkg/ccl/logictestccl/tests/local-legacy-schema-changer/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/ccl/logictestccl:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 5,
tags = [
"ccl_test",
Expand Down
4 changes: 3 additions & 1 deletion pkg/ccl/logictestccl/tests/local-mixed-22.2-23.1/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/ccl/logictestccl:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 6,
tags = [
"ccl_test",
Expand Down
4 changes: 3 additions & 1 deletion pkg/ccl/logictestccl/tests/local-vec-off/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/ccl/logictestccl:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 5,
tags = [
"ccl_test",
Expand Down
4 changes: 3 additions & 1 deletion pkg/ccl/logictestccl/tests/local/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/ccl/logictestccl:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 19,
tags = [
"ccl_test",
Expand Down
4 changes: 3 additions & 1 deletion pkg/ccl/logictestccl/tests/multiregion-15node-5region-3azs/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/ccl/logictestccl:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 4,
tags = [
"ccl_test",
Expand Down
4 changes: 3 additions & 1 deletion pkg/ccl/logictestccl/tests/multiregion-3node-3superlongregions/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/ccl/logictestccl:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 1,
tags = [
"ccl_test",
Expand Down
4 changes: 3 additions & 1 deletion pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-no-los/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/ccl/logictestccl:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 19,
tags = [
"ccl_test",
Expand Down
4 changes: 3 additions & 1 deletion pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-tenant/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/ccl/logictestccl:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 15,
tags = [
"ccl_test",
Expand Down
4 changes: 3 additions & 1 deletion pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs-vec-off/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/ccl/logictestccl:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 8,
tags = [
"ccl_test",
Expand Down
4 changes: 3 additions & 1 deletion pkg/ccl/logictestccl/tests/multiregion-9node-3region-3azs/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/ccl/logictestccl:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 26,
tags = [
"ccl_test",
Expand Down
4 changes: 3 additions & 1 deletion pkg/ccl/sqlitelogictestccl/tests/3node-tenant/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ go_test(
"//c-deps:libgeos", # keep
"@com_github_cockroachdb_sqllogictest//:testfiles", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 48,
tags = [
"ccl_test",
Expand Down
3 changes: 3 additions & 0 deletions pkg/cloud/amazon/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ go_test(
],
args = ["-test.timeout=55s"],
embed = [":amazon"],
exec_properties = {
"dockerNetwork": "standard",
},
deps = [
"//pkg/base",
"//pkg/blobs",
Expand Down
6 changes: 5 additions & 1 deletion pkg/cmd/generate-logictest/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,11 @@ go_test(
"//pkg/sql/logictest:testdata", # keep{{ end }}{{ if .ExecBuildLogicTest }}
"//pkg/sql/opt/exec/execbuilder:testdata", # keep{{ end }}
],
exec_properties = {"Pool": "large"},
exec_properties = {{ if eq .TestRuleName "cockroach-go-testserver-upgrade-to-master" }}{
"dockerNetwork": "standard",
{{ else }}{
{{ end }}"Pool": "large",
},
shard_count = {{ if gt .TestCount 48 }}48{{ else }}{{ .TestCount }}{{end}},
tags = [{{ if .Ccl }}
"ccl_test",{{ end }}
Expand Down
4 changes: 3 additions & 1 deletion pkg/sql/logictest/tests/5node-disk/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/sql/logictest:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 14,
tags = [
"cpu:3",
Expand Down
4 changes: 3 additions & 1 deletion pkg/sql/logictest/tests/5node/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/sql/logictest:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 20,
tags = [
"cpu:3",
Expand Down
5 changes: 4 additions & 1 deletion pkg/sql/logictest/tests/cockroach-go-testserver-upgrade-to-master/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ go_test(
"//pkg/cmd/cockroach-short", # keep
"//pkg/sql/logictest:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"dockerNetwork": "standard",
"Pool": "large",
},
shard_count = 9,
tags = [
"cpu:2",
Expand Down
4 changes: 3 additions & 1 deletion pkg/sql/logictest/tests/fakedist-disk/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/sql/logictest:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 48,
tags = [
"cpu:2",
Expand Down
4 changes: 3 additions & 1 deletion pkg/sql/logictest/tests/fakedist-vec-off/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/sql/logictest:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 48,
tags = [
"cpu:2",
Expand Down
4 changes: 3 additions & 1 deletion pkg/sql/logictest/tests/fakedist/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/sql/logictest:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 48,
tags = [
"cpu:2",
Expand Down
4 changes: 3 additions & 1 deletion pkg/sql/logictest/tests/local-legacy-schema-changer/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/sql/logictest:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 48,
tags = [
"cpu:1",
Expand Down
4 changes: 3 additions & 1 deletion pkg/sql/logictest/tests/local-mixed-22.2-23.1/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/sql/logictest:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 48,
tags = [
"cpu:1",
Expand Down
4 changes: 3 additions & 1 deletion pkg/sql/logictest/tests/local-vec-off/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/sql/logictest:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 48,
tags = [
"cpu:1",
Expand Down
4 changes: 3 additions & 1 deletion pkg/sql/logictest/tests/local/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/sql/logictest:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 48,
tags = [
"cpu:1",
Expand Down
4 changes: 3 additions & 1 deletion pkg/sql/logictest/tests/multiregion-9node-3region-3azs/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/sql/logictest:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 1,
tags = [
"cpu:4",
Expand Down
4 changes: 3 additions & 1 deletion pkg/sql/logictest/tests/multiregion-invalid-locality/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/sql/logictest:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 1,
tags = [
"cpu:2",
Expand Down
4 changes: 3 additions & 1 deletion pkg/sql/opt/exec/execbuilder/tests/5node/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ go_test(
"//c-deps:libgeos", # keep
"//pkg/sql/opt/exec/execbuilder:testdata", # keep
],
exec_properties = {"Pool": "large"},
exec_properties = {
"Pool": "large",
},
shard_count = 29,
tags = [
"cpu:3",
Expand Down
Loading