bazel/rbe: Rename engflow_pool -> rbe_pool (#36301)

Signed-off-by: Ryan Northey <[email protected]>
envoyproxy · Sep 24, 2024 · ec0c230 · ec0c230
1 parent 0d39eef
commit ec0c230
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/bazel/envoy_binary.bzl b/bazel/envoy_binary.bzl
@@ -18,7 +18,7 @@ def envoy_cc_binary(
         data = [],
         testonly = 0,
         visibility = None,
-        engflow_pool = None,
+        rbe_pool = None,
         exec_properties = {},
         external_deps = [],
         repository = "",
@@ -30,7 +30,7 @@ def envoy_cc_binary(
         features = [],
         linkstatic = True):
     exec_properties = exec_properties | select({
-        repository + "//bazel:engflow_rbe": {"Pool": engflow_pool} if engflow_pool else {},
+        repository + "//bazel:engflow_rbe": {"Pool": rbe_pool} if rbe_pool else {},
         "//conditions:default": {},
     })
     linker_inputs = envoy_exported_symbols_input()

diff --git a/bazel/envoy_library.bzl b/bazel/envoy_library.bzl
@@ -98,7 +98,7 @@ def envoy_cc_library(
         hdrs = [],
         copts = [],
         visibility = None,
-        engflow_pool = None,
+        rbe_pool = None,
         exec_properties = {},
         external_deps = [],
         tcmalloc_dep = None,
@@ -115,7 +115,7 @@ def envoy_cc_library(
     if tcmalloc_dep:
         deps += tcmalloc_external_deps(repository)
     exec_properties = exec_properties | select({
-        repository + "//bazel:engflow_rbe": {"Pool": engflow_pool} if engflow_pool else {},
+        repository + "//bazel:engflow_rbe": {"Pool": rbe_pool} if rbe_pool else {},
         "//conditions:default": {},
     })
 

diff --git a/bazel/envoy_test.bzl b/bazel/envoy_test.bzl
@@ -80,15 +80,15 @@ def envoy_cc_fuzz_test(
         name,
         corpus,
         dictionaries = [],
-        engflow_pool = None,
+        rbe_pool = None,
         exec_properties = {},
         repository = "",
         size = "medium",
         deps = [],
         tags = [],
         **kwargs):
     exec_properties = exec_properties | select({
-        repository + "//bazel:engflow_rbe": {"Pool": engflow_pool} if engflow_pool else {},
+        repository + "//bazel:engflow_rbe": {"Pool": rbe_pool} if rbe_pool else {},
         "//conditions:default": {},
     })
     if not (corpus.startswith("//") or corpus.startswith(":") or corpus.startswith("@")):
@@ -171,11 +171,11 @@ def envoy_cc_test(
         size = "medium",
         flaky = False,
         env = {},
-        engflow_pool = None,
+        rbe_pool = None,
         exec_properties = {}):
     coverage_tags = tags + ([] if coverage else ["nocoverage"])
     exec_properties = exec_properties | select({
-        repository + "//bazel:engflow_rbe": {"Pool": engflow_pool} if engflow_pool else {},
+        repository + "//bazel:engflow_rbe": {"Pool": rbe_pool} if rbe_pool else {},
         "//conditions:default": {},
     })
     native.cc_test(
@@ -211,7 +211,7 @@ def envoy_cc_test_library(
         srcs = [],
         hdrs = [],
         data = [],
-        engflow_pool = None,
+        rbe_pool = None,
         exec_properties = {},
         external_deps = [],
         deps = [],
@@ -222,7 +222,7 @@ def envoy_cc_test_library(
         alwayslink = 1,
         **kargs):
     exec_properties = exec_properties | select({
-        repository + "//bazel:engflow_rbe": {"Pool": engflow_pool} if engflow_pool else {},
+        repository + "//bazel:engflow_rbe": {"Pool": rbe_pool} if rbe_pool else {},
         "//conditions:default": {},
     })
     disable_pch = kargs.pop("disable_pch", True)
@@ -285,13 +285,13 @@ def envoy_benchmark_test(
         name,
         benchmark_binary,
         data = [],
-        engflow_pool = None,
+        rbe_pool = None,
         exec_properties = {},
         tags = [],
         repository = "",
         **kargs):
     exec_properties = exec_properties | select({
-        repository + "//bazel:engflow_rbe": {"Pool": engflow_pool} if engflow_pool else {},
+        repository + "//bazel:engflow_rbe": {"Pool": rbe_pool} if rbe_pool else {},
         "//conditions:default": {},
     })
     native.sh_test(