Skip to content

Commit a8bc41d

Browse files
phlaxphlax
committed
ci/tests: Revert some integration tests to 2core (#36784)
Signed-off-by: Ryan Northey <ryan@synca.io> Signed-off-by: phlax <phlax@users.noreply.github.com>
1 parent 3dd0502 commit a8bc41d

File tree

13 files changed

+27
-15
lines changed

13 files changed

+27
-15
lines changed

‎bazel/envoy_build_system.bzl

+7
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ def envoy_cmake(
120120
postfix_script = "",
121121
copy_pdb = False,
122122
pdb_name = "",
123+
rbe_pool = None,
124+
repository = "",
123125
cmake_files_dir = "$BUILD_TMPDIR/CMakeFiles",
124126
generate_crosstool_file = False,
125127
generate_args = ["-GNinja"],
@@ -128,6 +130,10 @@ def envoy_cmake(
128130
cache_entries.update(default_cache_entries)
129131
cache_entries_debug = dict(cache_entries)
130132
cache_entries_debug.update(debug_cache_entries)
133+
exec_properties = select({
134+
repository + "//bazel:engflow_rbe": {"Pool": rbe_pool} if rbe_pool else {},
135+
"//conditions:default": {},
136+
})
131137

132138
pf = ""
133139
if copy_pdb:
@@ -153,6 +159,7 @@ def envoy_cmake(
153159
"@envoy//bazel:dbg_build": cache_entries_debug,
154160
"//conditions:default": cache_entries,
155161
}),
162+
exec_properties = exec_properties,
156163
generate_args = generate_args,
157164
targets = targets,
158165
# TODO: Remove install target and make this work

‎bazel/foreign_cc/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,7 @@ envoy_cmake(
472472
"libLLVMDemangle.a",
473473
],
474474
}),
475+
rbe_pool = "4core",
475476
tags = ["skip_on_windows"],
476477
alwayslink = True,
477478
)

‎test/common/grpc/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ envoy_cc_test(
184184
name = "grpc_client_integration_test",
185185
size = "large",
186186
srcs = ["grpc_client_integration_test.cc"],
187-
rbe_pool = "6gig",
187+
rbe_pool = "2core",
188188
deps = [
189189
":grpc_client_integration_test_harness_lib",
190190
"//source/common/grpc:async_client_lib",

‎test/common/http/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ envoy_cc_test(
278278
"conn_manager_impl_test.cc",
279279
"conn_manager_impl_test_2.cc",
280280
],
281-
rbe_pool = "6gig",
281+
rbe_pool = "2core",
282282
deps = [
283283
":conn_manager_impl_test_base_lib",
284284
":custom_header_extension_lib",

‎test/common/upstream/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,7 @@ envoy_cc_test(
480480
envoy_cc_test(
481481
name = "bounded_load_hlb_test",
482482
srcs = ["bounded_load_hlb_test.cc"],
483+
rbe_pool = "6gig",
483484
deps = [
484485
":utility_lib",
485486
"//source/common/upstream:thread_aware_lb_lib",

‎test/config_test/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ envoy_cc_test(
3939
"EXAMPLE_CONFIGS_TAR_PATH": "envoy/configs/example_configs.tar",
4040
"GODEBUG": "cgocheck=0",
4141
},
42-
rbe_pool = "6gig",
42+
rbe_pool = "2core",
4343
deps = [
4444
":example_configs_test_lib",
4545
],

‎test/exe/BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ envoy_cc_test(
8282
name = "extra_extensions_test",
8383
size = "large",
8484
srcs = ["extra_extensions_test.cc"],
85-
rbe_pool = "6gig",
85+
rbe_pool = "2core",
8686
deps = [
8787
"//test/test_common:environment_lib",
8888
] + select({
@@ -111,7 +111,7 @@ envoy_cc_test(
111111
data = [
112112
"//source/extensions:extensions_metadata.yaml",
113113
],
114-
rbe_pool = "6gig",
114+
rbe_pool = "2core",
115115
deps = [
116116
"//test/test_common:environment_lib",
117117
] + select({

‎test/extensions/common/wasm/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ envoy_cc_test(
4242
"//test/extensions/common/wasm/test_data:test_restriction_cpp.wasm",
4343
]),
4444
external_deps = ["abseil_optional"],
45-
rbe_pool = "6gig",
45+
rbe_pool = "2core",
4646
tags = ["skip_on_windows"],
4747
deps = [
4848
"//source/common/common:hex_lib",

‎test/extensions/filters/http/wasm/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ envoy_extension_cc_test(
3636
"//test/extensions/filters/http/wasm/test_data:shared_queue_rust.wasm",
3737
]),
3838
extension_names = ["envoy.filters.http.wasm"],
39-
rbe_pool = "6gig",
39+
rbe_pool = "2core",
4040
shard_count = 50,
4141
tags = [
4242
"cpu:4",

‎test/extensions/tracers/common/ot/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ envoy_extension_cc_test(
1717
"opentracing_driver_impl_test.cc",
1818
],
1919
extension_names = ["envoy.tracers.dynamic_ot"],
20+
rbe_pool = "6gig",
2021
# TODO(wrowe): envoy_extension_ rules don't currently exclude windows extensions
2122
tags = ["skip_on_windows"],
2223
deps = [

‎test/extensions/tracers/dynamic_ot/BUILD

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ envoy_extension_cc_test(
2121
"@io_opentracing_cpp//mocktracer:libmocktracer_plugin.so",
2222
],
2323
extension_names = ["envoy.tracers.dynamic_ot"],
24+
rbe_pool = "6gig",
2425
# TODO(wrowe): envoy_extension_ rules don't currently exclude windows extensions
2526
tags = ["skip_on_windows"],
2627
deps = [
@@ -42,6 +43,7 @@ envoy_extension_cc_test(
4243
"@io_opentracing_cpp//mocktracer:libmocktracer_plugin.so",
4344
],
4445
extension_names = ["envoy.tracers.dynamic_ot"],
46+
rbe_pool = "6gig",
4547
# TODO(wrowe): envoy_extension_ rules don't currently exclude windows extensions
4648
tags = ["skip_on_windows"],
4749
deps = [

‎test/extensions/transport_sockets/tls/integration/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ envoy_cc_test(
2525
data = [
2626
"//test/config/integration/certs",
2727
],
28-
rbe_pool = "6gig",
28+
rbe_pool = "2core",
2929
deps = [
3030
":sni_to_header_filter_lib",
3131
":ssl_integration_test_lib",

‎test/integration/BUILD

+7-7
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ envoy_cc_test(
136136
data = [
137137
"//test/config/integration/certs",
138138
],
139-
rbe_pool = "6gig",
139+
rbe_pool = "2core",
140140
shard_count = 4,
141141
tags = [
142142
"cpu:3",
@@ -541,7 +541,7 @@ envoy_cc_test(
541541
srcs = [
542542
"http2_flood_integration_test.cc",
543543
],
544-
rbe_pool = "6gig",
544+
rbe_pool = "2core",
545545
shard_count = 6,
546546
tags = [
547547
"cpu:3",
@@ -1054,7 +1054,7 @@ envoy_cc_test(
10541054
name = "idle_timeout_integration_test",
10551055
size = "large",
10561056
srcs = ["idle_timeout_integration_test.cc"],
1057-
rbe_pool = "6gig",
1057+
rbe_pool = "2core",
10581058
# As this test has many pauses for idle timeouts, it takes a while to run.
10591059
# Shard it enough to bring the run time in line with other integration tests.
10601060
shard_count = 4,
@@ -1907,7 +1907,7 @@ envoy_cc_test(
19071907
data = [
19081908
"//test/config/integration/certs",
19091909
],
1910-
rbe_pool = "6gig",
1910+
rbe_pool = "2core",
19111911
shard_count = 8,
19121912
tags = [
19131913
"cpu:3",
@@ -1976,7 +1976,7 @@ envoy_cc_test(
19761976
srcs = [
19771977
"tcp_async_client_integration_test.cc",
19781978
],
1979-
rbe_pool = "6gig",
1979+
rbe_pool = "2core",
19801980
deps = [
19811981
":integration_lib",
19821982
"//test/integration/filters:test_network_async_tcp_filter_lib",
@@ -2074,7 +2074,7 @@ envoy_cc_test(
20742074
"//test/config/integration:server_xds_files",
20752075
"//test/config/integration/certs",
20762076
],
2077-
rbe_pool = "6gig",
2077+
rbe_pool = "2core",
20782078
tags = [
20792079
"cpu:3",
20802080
],
@@ -2388,7 +2388,7 @@ envoy_cc_test(
23882388
name = "direct_response_integration_test",
23892389
size = "large",
23902390
srcs = ["direct_response_integration_test.cc"],
2391-
rbe_pool = "6gig",
2391+
rbe_pool = "2core",
23922392
tags = [
23932393
"cpu:2",
23942394
],

0 commit comments

Comments
 (0)