Skip to content

Commit da6019a

Browse files
authored
feat: enable RBE again (#406)
* feat: enable RBE again It was disabled here 6749298#diff-c543330d148f738e9f3033a8afb70fec440c9328ae3d8f7b0019cc459b880c28L9 * chore: add comments
1 parent 3f7ad86 commit da6019a

File tree

7 files changed

+26
-6
lines changed

7 files changed

+26
-6
lines changed

.aspect/workflows/bazelrc

+10-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,17 @@ common --remote_download_outputs=minimal
33
common --nobuild_runfile_links
44

55
# remote execution
6-
common:rbe --extra_execution_platforms=//bazel/platforms:x86_64_linux_remote
7-
common:rbe --host_platform=//bazel/platforms:x86_64_linux_remote
6+
common:rbe --extra_execution_platforms=//tools/platforms:buildbarn_remote
7+
common:rbe --host_platform=//tools/platforms:buildbarn_remote
88
common:rbe --remote_executor=unix:///mnt/ephemeral/buildbarn/.cache/bb_clientd/grpc
99
common:rbe --genrule_strategy=remote,local
1010
common:rbe --jobs=32
1111
common:rbe --remote_timeout=3600
12+
13+
# from https://github.com/bazelbuild/bazel/issues/4685#issuecomment-1366208392
14+
test:rbe --strategy=CoverageReport=local
15+
test:rbe --experimental_split_coverage_postprocessing
16+
test:rbe --experimental_fetch_all_coverage_outputs
17+
test:rbe --remote_download_outputs=all
18+
# from https://github.com/bazelbuild/bazel/issues/4685#issuecomment-1599671891
19+
test:rbe --experimental_remote_download_regex=.*/(coverage.dat$|_coverage/_coverage_report.dat$)

.aspect/workflows/config.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ tasks:
1010
- -//speller/...
1111
bazel:
1212
flags:
13+
- --config=rbe
1314
- --test_tag_filters=-skip-on-aspect-workflows
1415
coverage:
1516
codecov_upload: true

logger/client/src/build/aspect/BUILD.bazel

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ load("@rules_jvm_external//:defs.bzl", "artifact")
33
java_library(
44
name = "JavaLoggingClientLibrary",
55
srcs = ["JavaLoggingClientLibrary.java"],
6+
# Workaround https://github.com/bazelbuild/bazel/issues/24838
7+
tags = ["no-remote-exec"],
68
deps = [
79
"//logger/schema:logger_java_grpc",
810
"//logger/schema:logger_java_proto",
@@ -14,6 +16,7 @@ java_library(
1416
java_binary(
1517
name = "JavaLoggingClient",
1618
srcs = ["JavaLoggingClient.java"],
19+
tags = ["no-remote-exec"], # see above
1720
visibility = ["//visibility:public"],
1821
deps = [":JavaLoggingClientLibrary"],
1922
)

logger/schema/BUILD.bazel

+2
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ java_proto_library(
6464
java_library(
6565
name = "logger_java_grpc",
6666
srcs = ["LoggerGrpc.java"],
67+
# Workaround https://github.com/bazelbuild/bazel/issues/24838
68+
tags = ["no-remote-exec"],
6769
deps = [
6870
":logger_java_proto",
6971
artifact("com.google.guava:guava"),

oci_go_image/BUILD.bazel

+4-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,10 @@ container_structure_test(
8181
configs = ["test.yaml"],
8282
# Use the image built for the target platform as it runs through docker
8383
image = ":transitioned_image",
84-
tags = ["requires-docker"],
84+
tags = [
85+
"no-remote-exec",
86+
"requires-docker",
87+
],
8588
)
8689

8790
oci_push(

oci_python_image/hello_world/BUILD.bazel

+4-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,10 @@ container_structure_test(
9292
name = "test",
9393
configs = ["test.yaml"],
9494
image = ":platform_image",
95-
tags = ["requires-docker"],
95+
tags = [
96+
"no-remote-exec",
97+
"requires-docker",
98+
],
9699
)
97100

98101
py_test(
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
platform(
2-
name = "x86_64_linux_remote",
2+
name = "buildbarn_remote",
33
constraint_values = [
44
"@platforms//os:linux",
55
"@platforms//cpu:x86_64",
66
],
77
exec_properties = {
88
"OSFamily": "Linux",
9-
"container-image": "docker://ghcr.io/catthehacker/ubuntu:act-22.04@sha256:5f9c35c25db1d51a8ddaae5c0ba8d3c163c5e9a4a6cc97acd409ac7eae239448",
9+
"container-image": "docker://public.ecr.aws/docker/library/python@sha256:247105bbbe7f7afc7c12ac893be65b5a32951c1d0276392dc2bf09861ba288a6",
1010
},
1111
visibility = ["//visibility:public"],
1212
)

0 commit comments

Comments
 (0)