infra: Set siso_remote_jobs on developer build perf builders
This updates the `remote_jobs` for siso on the developer build perf builders to 5120. It was previously unset and defaults to the Siso's calculation.
However, https://crrev.com/c/6457287 changes the recipe to calculate
the default if it's unset.
This CL also sets `use_reclient=true` explicitly for the Siso/Reproxy
builds on the developer builds.
Change-Id: Ia69eecec558a20d4658973e72c2cde5a838b7bd8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6466368
Auto-Submit: Junji Watanabe <jwata@google.com>
Reviewed-by: Fumitoshi Ukai <ukai@google.com>
Commit-Queue: Fumitoshi Ukai <ukai@google.com>
Cr-Commit-Position: refs/heads/main@{#1448152}
diff --git a/infra/config/generated/builders/build/android-build-perf-developer/gn-args.json b/infra/config/generated/builders/build/android-build-perf-developer/gn-args.json
index 3f5d2e1f4..5f56200b 100644
--- a/infra/config/generated/builders/build/android-build-perf-developer/gn-args.json
+++ b/infra/config/generated/builders/build/android-build-perf-developer/gn-args.json
@@ -33,6 +33,7 @@
"symbol_level": 2,
"target_cpu": "arm64",
"target_os": "android",
+ "use_reclient": true,
"use_remoteexec": true,
"use_siso": true
}
diff --git a/infra/config/generated/builders/build/android-build-perf-developer/properties.json b/infra/config/generated/builders/build/android-build-perf-developer/properties.json
index 054b1e4c..0436db8 100644
--- a/infra/config/generated/builders/build/android-build-perf-developer/properties.json
+++ b/infra/config/generated/builders/build/android-build-perf-developer/properties.json
@@ -64,7 +64,8 @@
"experiments": [
"no-fallback"
],
- "project": "rbe-chromium-untrusted"
+ "project": "rbe-chromium-untrusted",
+ "remote_jobs": 5120
},
"$recipe_engine/resultdb/test_presentation": {
"column_keys": [],
diff --git a/infra/config/generated/builders/build/ios-build-perf-developer/gn-args.json b/infra/config/generated/builders/build/ios-build-perf-developer/gn-args.json
index 7ddc8569..28f1da2 100644
--- a/infra/config/generated/builders/build/ios-build-perf-developer/gn-args.json
+++ b/infra/config/generated/builders/build/ios-build-perf-developer/gn-args.json
@@ -27,6 +27,7 @@
"target_cpu": "arm64",
"target_environment": "simulator",
"target_os": "ios",
+ "use_reclient": true,
"use_remoteexec": true,
"use_siso": true
}
diff --git a/infra/config/generated/builders/build/ios-build-perf-developer/properties.json b/infra/config/generated/builders/build/ios-build-perf-developer/properties.json
index ce685ce..f429149 100644
--- a/infra/config/generated/builders/build/ios-build-perf-developer/properties.json
+++ b/infra/config/generated/builders/build/ios-build-perf-developer/properties.json
@@ -57,7 +57,8 @@
"experiments": [
"no-fallback"
],
- "project": "rbe-chromium-untrusted"
+ "project": "rbe-chromium-untrusted",
+ "remote_jobs": 5120
},
"$recipe_engine/resultdb/test_presentation": {
"column_keys": [],
diff --git a/infra/config/generated/builders/build/linux-build-perf-developer/gn-args.json b/infra/config/generated/builders/build/linux-build-perf-developer/gn-args.json
index a82e742b..7c7a3ac 100644
--- a/infra/config/generated/builders/build/linux-build-perf-developer/gn-args.json
+++ b/infra/config/generated/builders/build/linux-build-perf-developer/gn-args.json
@@ -30,6 +30,7 @@
"symbol_level": 2,
"target_cpu": "x64",
"target_os": "linux",
+ "use_reclient": true,
"use_remoteexec": true,
"use_siso": true
}
diff --git a/infra/config/generated/builders/build/linux-build-perf-developer/properties.json b/infra/config/generated/builders/build/linux-build-perf-developer/properties.json
index a97abb0b..3bcd1a9 100644
--- a/infra/config/generated/builders/build/linux-build-perf-developer/properties.json
+++ b/infra/config/generated/builders/build/linux-build-perf-developer/properties.json
@@ -56,7 +56,8 @@
"experiments": [
"no-fallback"
],
- "project": "rbe-chromium-untrusted"
+ "project": "rbe-chromium-untrusted",
+ "remote_jobs": 5120
},
"$recipe_engine/resultdb/test_presentation": {
"column_keys": [],
diff --git a/infra/config/generated/builders/build/mac-build-perf-developer/gn-args.json b/infra/config/generated/builders/build/mac-build-perf-developer/gn-args.json
index 9ca12091..11c70cc6 100644
--- a/infra/config/generated/builders/build/mac-build-perf-developer/gn-args.json
+++ b/infra/config/generated/builders/build/mac-build-perf-developer/gn-args.json
@@ -30,6 +30,7 @@
"symbol_level": 2,
"target_cpu": "arm64",
"target_os": "mac",
+ "use_reclient": true,
"use_remoteexec": true,
"use_siso": true
}
diff --git a/infra/config/generated/builders/build/mac-build-perf-developer/properties.json b/infra/config/generated/builders/build/mac-build-perf-developer/properties.json
index b33a1a97..139b263c 100644
--- a/infra/config/generated/builders/build/mac-build-perf-developer/properties.json
+++ b/infra/config/generated/builders/build/mac-build-perf-developer/properties.json
@@ -54,7 +54,8 @@
"experiments": [
"no-fallback"
],
- "project": "rbe-chromium-untrusted"
+ "project": "rbe-chromium-untrusted",
+ "remote_jobs": 5120
},
"$recipe_engine/resultdb/test_presentation": {
"column_keys": [],
diff --git a/infra/config/generated/builders/build/win-build-perf-developer/gn-args.json b/infra/config/generated/builders/build/win-build-perf-developer/gn-args.json
index 93f228a..816f1da 100644
--- a/infra/config/generated/builders/build/win-build-perf-developer/gn-args.json
+++ b/infra/config/generated/builders/build/win-build-perf-developer/gn-args.json
@@ -30,6 +30,7 @@
"symbol_level": 2,
"target_cpu": "x64",
"target_os": "win",
+ "use_reclient": true,
"use_remoteexec": true,
"use_siso": true
}
diff --git a/infra/config/generated/builders/build/win-build-perf-developer/properties.json b/infra/config/generated/builders/build/win-build-perf-developer/properties.json
index 812ee3d..c326bf9 100644
--- a/infra/config/generated/builders/build/win-build-perf-developer/properties.json
+++ b/infra/config/generated/builders/build/win-build-perf-developer/properties.json
@@ -56,7 +56,8 @@
"experiments": [
"no-fallback"
],
- "project": "rbe-chromium-untrusted"
+ "project": "rbe-chromium-untrusted",
+ "remote_jobs": 5120
},
"$recipe_engine/resultdb/test_presentation": {
"column_keys": [],
diff --git a/infra/config/subprojects/build/build.star b/infra/config/subprojects/build/build.star
index b2381405..3faa5c4 100644
--- a/infra/config/subprojects/build/build.star
+++ b/infra/config/subprojects/build/build.star
@@ -602,7 +602,7 @@
),
gn_args = {
"ninja": gn_args.config(configs = ["android_developer", "android_fastbuild", "remoteexec", "no_siso"]),
- "siso_reproxy": gn_args.config(configs = ["android_developer", "android_fastbuild", "remoteexec"]),
+ "siso_reproxy": gn_args.config(configs = ["android_developer", "android_fastbuild", "remoteexec", "reclient"]),
"siso_native": gn_args.config(configs = ["android_developer", "android_fastbuild", "remoteexec", "no_reclient"]),
},
os = os.LINUX_DEFAULT,
@@ -611,6 +611,7 @@
short_name = "dev",
),
reclient_jobs = 5120,
+ siso_remote_jobs = 5120,
)
developer_build_perf_builder(
@@ -635,7 +636,7 @@
),
gn_args = {
"ninja": gn_args.config(configs = ["developer", "remoteexec", "no_siso", "linux", "x64"]),
- "siso_reproxy": gn_args.config(configs = ["developer", "remoteexec", "linux", "x64"]),
+ "siso_reproxy": gn_args.config(configs = ["developer", "remoteexec", "reclient", "linux", "x64"]),
"siso_native": gn_args.config(configs = ["developer", "remoteexec", "no_reclient", "linux", "x64"]),
},
os = os.LINUX_DEFAULT,
@@ -644,6 +645,7 @@
short_name = "dev",
),
reclient_jobs = 5120,
+ siso_remote_jobs = 5120,
)
developer_build_perf_builder(
@@ -668,7 +670,7 @@
),
gn_args = {
"ninja": gn_args.config(configs = ["developer", "remoteexec", "no_siso", "win", "x64"]),
- "siso_reproxy": gn_args.config(configs = ["developer", "remoteexec", "win", "x64"]),
+ "siso_reproxy": gn_args.config(configs = ["developer", "remoteexec", "reclient", "win", "x64"]),
"siso_native": gn_args.config(configs = ["developer", "remoteexec", "no_reclient", "win", "x64"]),
},
os = os.WINDOWS_DEFAULT,
@@ -677,6 +679,7 @@
short_name = "dev",
),
reclient_jobs = 1000,
+ siso_remote_jobs = 5120, # Siso doesn't set remote limit for Window builds.
)
developer_build_perf_builder(
@@ -701,7 +704,7 @@
),
gn_args = {
"ninja": gn_args.config(configs = ["developer", "remoteexec", "no_siso", "mac", "arm64"]),
- "siso_reproxy": gn_args.config(configs = ["developer", "remoteexec", "mac", "arm64"]),
+ "siso_reproxy": gn_args.config(configs = ["developer", "remoteexec", "reclient", "mac", "arm64"]),
"siso_native": gn_args.config(configs = ["developer", "remoteexec", "no_reclient", "mac", "arm64"]),
},
os = os.MAC_DEFAULT,
@@ -712,6 +715,7 @@
),
reclient_jobs = 640,
siso_configs = [],
+ siso_remote_jobs = 5120, # Siso doesn't set remote limit for Mac builds.
)
developer_build_perf_builder(
@@ -739,7 +743,7 @@
),
gn_args = {
"ninja": gn_args.config(configs = ["ios_developer", "remoteexec", "no_siso", "arm64"]),
- "siso_reproxy": gn_args.config(configs = ["ios_developer", "remoteexec", "arm64"]),
+ "siso_reproxy": gn_args.config(configs = ["ios_developer", "remoteexec", "reclient", "arm64"]),
"siso_native": gn_args.config(configs = ["ios_developer", "remoteexec", "no_reclient", "arm64"]),
},
os = os.MAC_DEFAULT,
@@ -750,6 +754,7 @@
),
reclient_jobs = 640,
siso_configs = [],
+ siso_remote_jobs = 5120, # Siso doesn't set remote limit for iOS builds.
xcode = xcode.xcode_default,
)