Skip to content

Commit

Permalink
Rename exec_properties to internal_exec_properties in _rbe_config (#912)
Browse files Browse the repository at this point in the history
* Rename exec_properties to _exec_properties to make rbe_config compatible with --experimental_repo_remote_exec

* Rename exec_properties to internal_exec_properties in _rbe_autoconfig

Co-authored-by: Suvanjan Mukherjee <[email protected]>
  • Loading branch information
agluszak and smukherj1 authored Sep 8, 2020
1 parent 923ee94 commit 9a2fbe2
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions rules/rbe_repo.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ def _rbe_autoconfig_impl(ctx):
ctx.report_progress("creating export platform")
create_export_platform(
ctx,
exec_properties = ctx.attr.exec_properties,
exec_properties = ctx.attr.internal_exec_properties,
exec_compatible_with = exec_compatible_with,
target_compatible_with = target_compatible_with,
image_name = resolve_rbe_original_image_name(ctx, image_name),
Expand Down Expand Up @@ -617,7 +617,7 @@ def _rbe_autoconfig_impl(ctx):
ctx.report_progress("creating external repo platform")
create_external_repo_platform(
ctx,
exec_properties = ctx.attr.exec_properties,
exec_properties = ctx.attr.internal_exec_properties,
exec_compatible_with = exec_compatible_with,
target_compatible_with = target_compatible_with,
image_name = resolve_rbe_original_image_name(ctx, image_name),
Expand All @@ -632,7 +632,7 @@ def _rbe_autoconfig_impl(ctx):
create_config_aliases(ctx, toolchain_config_spec_name)
create_alias_platform(
ctx,
exec_properties = ctx.attr.exec_properties,
exec_properties = ctx.attr.internal_exec_properties,
exec_compatible_with = exec_compatible_with,
target_compatible_with = target_compatible_with,
image_name = resolve_rbe_original_image_name(ctx, image_name),
Expand Down Expand Up @@ -782,7 +782,7 @@ _rbe_autoconfig = repository_rule(
"the platform in its constraint_values attr). For " +
"example, [\"@bazel_tools//platforms:linux\"]."),
),
"exec_properties": attr.string_dict(
"internal_exec_properties": attr.string_dict(
doc = (
"Optional. The execution properties to be used when creating the " +
"underlying platform. When providing this attribute, " +
Expand Down Expand Up @@ -1192,7 +1192,7 @@ def rbe_autoconfig(
digest = digest,
env = env,
exec_compatible_with = exec_compatible_with,
exec_properties = exec_properties,
internal_exec_properties = exec_properties,
export_configs = export_configs,
java_home = java_home,
toolchain_config_suite_spec = toolchain_config_suite_spec_stripped,
Expand Down

0 comments on commit 9a2fbe2

Please sign in to comment.