Skip to content

Commit e125d18

Browse files
new Buck target using ConstrainedGangSpec
Reviewed By: IanChilds Differential Revision: D94789611 fbshipit-source-id: 3edccfa8f71d671b814ac42b6ee718bfde323625
1 parent 157f2e9 commit e125d18

2 files changed

Lines changed: 12 additions & 0 deletions

File tree

decls/re_test_common.bzl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ def _opts_for_tests_arg() -> Attr:
1919
# "use_case": str | None
2020
# "remote_cache_enabled": bool | None
2121
# "dependencies": list<Dict<str, str>> | []
22+
# "gang_workers": list<Dict<str, str>> | []
23+
# "gang": Dict<str, str | int | Dict<str, str>> | None
2224
# "resource_units": int | None
2325
# "remote_execution_dynamic_image": dict<str, str | list<str>> | None
2426
# }
@@ -31,6 +33,8 @@ def _opts_for_tests_arg() -> Attr:
3133
value = attrs.one_of(
3234
attrs.string(),
3335
attrs.list(attrs.string()),
36+
attrs.dict(key = attrs.string(), value = attrs.string(), sorted = False),
37+
attrs.int(),
3438
),
3539
sorted = False,
3640
),

tests/re_utils.bzl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ def get_re_executors_from_props(ctx: AnalysisContext) -> ([CommandExecutorConfig
8282
remote_cache_enabled = re_props_copy.pop("remote_cache_enabled", None)
8383
re_dependencies = re_props_copy.pop("dependencies", [])
8484
re_gang_workers = re_props_copy.pop("gang_workers", [])
85+
re_gang = re_props_copy.pop("gang", None)
8586
local_enabled = re_props_copy.pop("local_enabled", False)
8687
local_listing_enabled = re_props_copy.pop("local_listing_enabled", None)
8788
re_resource_units = re_props_copy.pop("resource_units", None)
@@ -91,6 +92,12 @@ def get_re_executors_from_props(ctx: AnalysisContext) -> ([CommandExecutorConfig
9192
unexpected_props = ", ".join(re_props_copy.keys())
9293
fail("found unexpected re props: " + unexpected_props)
9394

95+
meta_internal_extra_params = None
96+
if re_gang != None:
97+
meta_internal_extra_params = {
98+
"remote_execution_gang": re_gang,
99+
}
100+
94101
default_executor = CommandExecutorConfig(
95102
local_enabled = local_enabled,
96103
remote_enabled = True,
@@ -101,6 +108,7 @@ def get_re_executors_from_props(ctx: AnalysisContext) -> ([CommandExecutorConfig
101108
remote_execution_gang_workers = re_gang_workers,
102109
remote_execution_resource_units = re_resource_units,
103110
remote_execution_dynamic_image = re_dynamic_image,
111+
meta_internal_extra_params = meta_internal_extra_params,
104112
)
105113

106114
listing_executor = default_executor

0 commit comments

Comments
 (0)