Reland "infra: Replace Reclient with Siso's builtin RBE client on Windows CI builders"
This reverts commit8f3948e96d. Reason for revert: The fix has been rolled out in siso v1.1.13. Original change's description: > Revert "infra: Replace Reclient with Siso's builtin RBE client on Windows CI builders" > > This reverts commit5e929665fa. > > Reason for revert: Windows CI builds became slow due to unknown RBE worker error? https://cloudlogging.app.goo.gl/ZzPWB7nHkeo5wCNK7 > > Original change's description: > > infra: Replace Reclient with Siso's builtin RBE client on Windows CI builders > > > > Most tryjobs have switched from Reclient to Siso's builtin RBE client. > > This CL replaces the RBE client on Windows CI. > > > > Bug: 379584977 > > Change-Id: Ife6c778a775a792a1cae4865df873ea65ac03079 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6242375 > > Commit-Queue: Junji Watanabe <jwata@google.com> > > Reviewed-by: Ben Pastene <bpastene@chromium.org> > > Cr-Commit-Position: refs/heads/main@{#1417932} > > Bug: 379584977 > Change-Id: I2fe81f4b0b5a1d9c57caca58ee8d177b8d7fc108 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6242979 > Reviewed-by: Takuto Ikuta <tikuta@chromium.org> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Junji Watanabe <jwata@google.com> > Cr-Commit-Position: refs/heads/main@{#1417966} Bug: 379584977 Change-Id: I3fe1e8148325c2f9f977eba501d107f57861d167 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6267481 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Junji Watanabe <jwata@google.com> Reviewed-by: Takuto Ikuta <tikuta@chromium.org> Reviewed-by: Ben Pastene <bpastene@chromium.org> Cr-Commit-Position: refs/heads/main@{#1424335}
This commit is contained in:
Junji Watanabe
committed by
Chromium LUCI CQ
Chromium LUCI CQ
parent
8692ac2240
commit
e751662b23
infra/config
generated
builders
ci
WebKit Win10
Win Builder (dbg)
Win Builder
Win x64 Builder (dbg)
Win x64 Builder
Win10 Tests x64 (dbg)
Win10 Tests x64
linux-win-cross-rel
win-arm64-dbg
win-arm64-rel
subprojects
chromium
@ -75,18 +75,15 @@
|
||||
"targets_spec_directory": "src/infra/config/generated/builders/ci/WebKit Win10/targets"
|
||||
}
|
||||
},
|
||||
"$build/reclient": {
|
||||
"instance": "rbe-chromium-trusted",
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"scandeps_server": true
|
||||
},
|
||||
"$build/siso": {
|
||||
"configs": [
|
||||
"builder"
|
||||
],
|
||||
"enable_cloud_monitoring": true,
|
||||
"enable_cloud_profiler": true,
|
||||
"enable_cloud_trace": true,
|
||||
"experiments": [],
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"project": "rbe-chromium-trusted",
|
||||
"remote_jobs": 250
|
||||
},
|
||||
|
||||
@ -1,16 +1,13 @@
|
||||
{
|
||||
"$build/reclient": {
|
||||
"instance": "rbe-chromium-untrusted",
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"scandeps_server": true
|
||||
},
|
||||
"$build/siso": {
|
||||
"configs": [
|
||||
"builder"
|
||||
],
|
||||
"enable_cloud_monitoring": true,
|
||||
"enable_cloud_profiler": true,
|
||||
"enable_cloud_trace": true,
|
||||
"experiments": [],
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"project": "rbe-chromium-untrusted",
|
||||
"remote_jobs": 250
|
||||
}
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
"symbol_level": 0,
|
||||
"target_cpu": "x86",
|
||||
"target_os": "win",
|
||||
"use_reclient": false,
|
||||
"use_remoteexec": true,
|
||||
"use_siso": true
|
||||
}
|
||||
|
||||
@ -49,21 +49,15 @@
|
||||
"targets_spec_directory": "src/infra/config/generated/builders/ci/Win Builder (dbg)/targets"
|
||||
}
|
||||
},
|
||||
"$build/reclient": {
|
||||
"bootstrap_env": {
|
||||
"RBE_experimental_exit_on_stuck_actions": "true"
|
||||
},
|
||||
"instance": "rbe-chromium-trusted",
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"scandeps_server": true
|
||||
},
|
||||
"$build/siso": {
|
||||
"configs": [
|
||||
"builder"
|
||||
],
|
||||
"enable_cloud_monitoring": true,
|
||||
"enable_cloud_profiler": true,
|
||||
"enable_cloud_trace": true,
|
||||
"experiments": [],
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"project": "rbe-chromium-trusted",
|
||||
"remote_jobs": 250
|
||||
},
|
||||
|
||||
@ -1,19 +1,13 @@
|
||||
{
|
||||
"$build/reclient": {
|
||||
"bootstrap_env": {
|
||||
"RBE_experimental_exit_on_stuck_actions": "true"
|
||||
},
|
||||
"instance": "rbe-chromium-untrusted",
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"scandeps_server": true
|
||||
},
|
||||
"$build/siso": {
|
||||
"configs": [
|
||||
"builder"
|
||||
],
|
||||
"enable_cloud_monitoring": true,
|
||||
"enable_cloud_profiler": true,
|
||||
"enable_cloud_trace": true,
|
||||
"experiments": [],
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"project": "rbe-chromium-untrusted",
|
||||
"remote_jobs": 250
|
||||
}
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
"symbol_level": 0,
|
||||
"target_cpu": "x86",
|
||||
"target_os": "win",
|
||||
"use_reclient": false,
|
||||
"use_remoteexec": true,
|
||||
"use_siso": true
|
||||
}
|
||||
|
||||
@ -85,18 +85,15 @@
|
||||
"targets_spec_directory": "src/infra/config/generated/builders/ci/Win Builder/targets"
|
||||
}
|
||||
},
|
||||
"$build/reclient": {
|
||||
"instance": "rbe-chromium-trusted",
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"scandeps_server": true
|
||||
},
|
||||
"$build/siso": {
|
||||
"configs": [
|
||||
"builder"
|
||||
],
|
||||
"enable_cloud_monitoring": true,
|
||||
"enable_cloud_profiler": true,
|
||||
"enable_cloud_trace": true,
|
||||
"experiments": [],
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"project": "rbe-chromium-trusted",
|
||||
"remote_jobs": 250
|
||||
},
|
||||
|
||||
@ -1,16 +1,13 @@
|
||||
{
|
||||
"$build/reclient": {
|
||||
"instance": "rbe-chromium-untrusted",
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"scandeps_server": true
|
||||
},
|
||||
"$build/siso": {
|
||||
"configs": [
|
||||
"builder"
|
||||
],
|
||||
"enable_cloud_monitoring": true,
|
||||
"enable_cloud_profiler": true,
|
||||
"enable_cloud_trace": true,
|
||||
"experiments": [],
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"project": "rbe-chromium-untrusted",
|
||||
"remote_jobs": 250
|
||||
}
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
"symbol_level": 1,
|
||||
"target_cpu": "x64",
|
||||
"target_os": "win",
|
||||
"use_reclient": false,
|
||||
"use_remoteexec": true,
|
||||
"use_siso": true
|
||||
}
|
||||
|
||||
@ -85,18 +85,15 @@
|
||||
"targets_spec_directory": "src/infra/config/generated/builders/ci/Win x64 Builder (dbg)/targets"
|
||||
}
|
||||
},
|
||||
"$build/reclient": {
|
||||
"instance": "rbe-chromium-trusted",
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"scandeps_server": true
|
||||
},
|
||||
"$build/siso": {
|
||||
"configs": [
|
||||
"builder"
|
||||
],
|
||||
"enable_cloud_monitoring": true,
|
||||
"enable_cloud_profiler": true,
|
||||
"enable_cloud_trace": true,
|
||||
"experiments": [],
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"project": "rbe-chromium-trusted",
|
||||
"remote_jobs": 250
|
||||
},
|
||||
|
||||
@ -1,16 +1,13 @@
|
||||
{
|
||||
"$build/reclient": {
|
||||
"instance": "rbe-chromium-untrusted",
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"scandeps_server": true
|
||||
},
|
||||
"$build/siso": {
|
||||
"configs": [
|
||||
"builder"
|
||||
],
|
||||
"enable_cloud_monitoring": true,
|
||||
"enable_cloud_profiler": true,
|
||||
"enable_cloud_trace": true,
|
||||
"experiments": [],
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"project": "rbe-chromium-untrusted",
|
||||
"remote_jobs": 250
|
||||
}
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
"symbol_level": 1,
|
||||
"target_cpu": "x64",
|
||||
"target_os": "win",
|
||||
"use_reclient": false,
|
||||
"use_remoteexec": true,
|
||||
"use_siso": true
|
||||
}
|
||||
|
||||
@ -137,18 +137,15 @@
|
||||
"targets_spec_directory": "src/infra/config/generated/builders/ci/Win x64 Builder/targets"
|
||||
}
|
||||
},
|
||||
"$build/reclient": {
|
||||
"instance": "rbe-chromium-trusted",
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"scandeps_server": true
|
||||
},
|
||||
"$build/siso": {
|
||||
"configs": [
|
||||
"builder"
|
||||
],
|
||||
"enable_cloud_monitoring": true,
|
||||
"enable_cloud_profiler": true,
|
||||
"enable_cloud_trace": true,
|
||||
"experiments": [],
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"project": "rbe-chromium-trusted",
|
||||
"remote_jobs": 250
|
||||
},
|
||||
|
||||
@ -1,16 +1,13 @@
|
||||
{
|
||||
"$build/reclient": {
|
||||
"instance": "rbe-chromium-untrusted",
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"scandeps_server": true
|
||||
},
|
||||
"$build/siso": {
|
||||
"configs": [
|
||||
"builder"
|
||||
],
|
||||
"enable_cloud_monitoring": true,
|
||||
"enable_cloud_profiler": true,
|
||||
"enable_cloud_trace": true,
|
||||
"experiments": [],
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"project": "rbe-chromium-untrusted",
|
||||
"remote_jobs": 250
|
||||
}
|
||||
|
||||
@ -75,18 +75,15 @@
|
||||
"targets_spec_directory": "src/infra/config/generated/builders/ci/Win10 Tests x64 (dbg)/targets"
|
||||
}
|
||||
},
|
||||
"$build/reclient": {
|
||||
"instance": "rbe-chromium-trusted",
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"scandeps_server": true
|
||||
},
|
||||
"$build/siso": {
|
||||
"configs": [
|
||||
"builder"
|
||||
],
|
||||
"enable_cloud_monitoring": true,
|
||||
"enable_cloud_profiler": true,
|
||||
"enable_cloud_trace": true,
|
||||
"experiments": [],
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"project": "rbe-chromium-trusted",
|
||||
"remote_jobs": 250
|
||||
},
|
||||
|
||||
@ -1,16 +1,13 @@
|
||||
{
|
||||
"$build/reclient": {
|
||||
"instance": "rbe-chromium-untrusted",
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"scandeps_server": true
|
||||
},
|
||||
"$build/siso": {
|
||||
"configs": [
|
||||
"builder"
|
||||
],
|
||||
"enable_cloud_monitoring": true,
|
||||
"enable_cloud_profiler": true,
|
||||
"enable_cloud_trace": true,
|
||||
"experiments": [],
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"project": "rbe-chromium-untrusted",
|
||||
"remote_jobs": 250
|
||||
}
|
||||
|
||||
@ -82,18 +82,15 @@
|
||||
"targets_spec_directory": "src/infra/config/generated/builders/ci/Win10 Tests x64/targets"
|
||||
}
|
||||
},
|
||||
"$build/reclient": {
|
||||
"instance": "rbe-chromium-trusted",
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"scandeps_server": true
|
||||
},
|
||||
"$build/siso": {
|
||||
"configs": [
|
||||
"builder"
|
||||
],
|
||||
"enable_cloud_monitoring": true,
|
||||
"enable_cloud_profiler": true,
|
||||
"enable_cloud_trace": true,
|
||||
"experiments": [],
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"project": "rbe-chromium-trusted",
|
||||
"remote_jobs": 250
|
||||
},
|
||||
|
||||
@ -1,16 +1,13 @@
|
||||
{
|
||||
"$build/reclient": {
|
||||
"instance": "rbe-chromium-untrusted",
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"scandeps_server": true
|
||||
},
|
||||
"$build/siso": {
|
||||
"configs": [
|
||||
"builder"
|
||||
],
|
||||
"enable_cloud_monitoring": true,
|
||||
"enable_cloud_profiler": true,
|
||||
"enable_cloud_trace": true,
|
||||
"experiments": [],
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"project": "rbe-chromium-untrusted",
|
||||
"remote_jobs": 250
|
||||
}
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
"symbol_level": 1,
|
||||
"target_cpu": "x64",
|
||||
"target_os": "win",
|
||||
"use_reclient": false,
|
||||
"use_remoteexec": true,
|
||||
"use_siso": true
|
||||
}
|
||||
|
||||
@ -53,18 +53,15 @@
|
||||
"targets_spec_directory": "src/infra/config/generated/builders/ci/linux-win-cross-rel/targets"
|
||||
}
|
||||
},
|
||||
"$build/reclient": {
|
||||
"instance": "rbe-chromium-trusted",
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"scandeps_server": true
|
||||
},
|
||||
"$build/siso": {
|
||||
"configs": [
|
||||
"builder"
|
||||
],
|
||||
"enable_cloud_monitoring": true,
|
||||
"enable_cloud_profiler": true,
|
||||
"enable_cloud_trace": true,
|
||||
"experiments": [],
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"project": "rbe-chromium-trusted",
|
||||
"remote_jobs": 250
|
||||
},
|
||||
|
||||
@ -1,16 +1,13 @@
|
||||
{
|
||||
"$build/reclient": {
|
||||
"instance": "rbe-chromium-untrusted",
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"scandeps_server": true
|
||||
},
|
||||
"$build/siso": {
|
||||
"configs": [
|
||||
"builder"
|
||||
],
|
||||
"enable_cloud_monitoring": true,
|
||||
"enable_cloud_profiler": true,
|
||||
"enable_cloud_trace": true,
|
||||
"experiments": [],
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"project": "rbe-chromium-untrusted",
|
||||
"remote_jobs": 250
|
||||
}
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
"symbol_level": 1,
|
||||
"target_cpu": "arm64",
|
||||
"target_os": "win",
|
||||
"use_reclient": false,
|
||||
"use_remoteexec": true,
|
||||
"use_siso": true
|
||||
}
|
||||
|
||||
@ -91,18 +91,15 @@
|
||||
"targets_spec_directory": "src/infra/config/generated/builders/ci/win-arm64-dbg/targets"
|
||||
}
|
||||
},
|
||||
"$build/reclient": {
|
||||
"instance": "rbe-chromium-trusted",
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"scandeps_server": true
|
||||
},
|
||||
"$build/siso": {
|
||||
"configs": [
|
||||
"builder"
|
||||
],
|
||||
"enable_cloud_monitoring": true,
|
||||
"enable_cloud_profiler": true,
|
||||
"enable_cloud_trace": true,
|
||||
"experiments": [],
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"project": "rbe-chromium-trusted",
|
||||
"remote_jobs": 250
|
||||
},
|
||||
|
||||
@ -1,16 +1,13 @@
|
||||
{
|
||||
"$build/reclient": {
|
||||
"instance": "rbe-chromium-untrusted",
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"scandeps_server": true
|
||||
},
|
||||
"$build/siso": {
|
||||
"configs": [
|
||||
"builder"
|
||||
],
|
||||
"enable_cloud_monitoring": true,
|
||||
"enable_cloud_profiler": true,
|
||||
"enable_cloud_trace": true,
|
||||
"experiments": [],
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"project": "rbe-chromium-untrusted",
|
||||
"remote_jobs": 250
|
||||
}
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
"symbol_level": 1,
|
||||
"target_cpu": "arm64",
|
||||
"target_os": "win",
|
||||
"use_reclient": false,
|
||||
"use_remoteexec": true,
|
||||
"use_siso": true
|
||||
}
|
||||
|
||||
@ -94,21 +94,15 @@
|
||||
"targets_spec_directory": "src/infra/config/generated/builders/ci/win-arm64-rel/targets"
|
||||
}
|
||||
},
|
||||
"$build/reclient": {
|
||||
"bootstrap_env": {
|
||||
"RBE_depsscan_connect_timeout": "120s"
|
||||
},
|
||||
"instance": "rbe-chromium-trusted",
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"scandeps_server": true
|
||||
},
|
||||
"$build/siso": {
|
||||
"configs": [
|
||||
"builder"
|
||||
],
|
||||
"enable_cloud_monitoring": true,
|
||||
"enable_cloud_profiler": true,
|
||||
"enable_cloud_trace": true,
|
||||
"experiments": [],
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"project": "rbe-chromium-trusted",
|
||||
"remote_jobs": 250
|
||||
},
|
||||
|
||||
@ -1,19 +1,13 @@
|
||||
{
|
||||
"$build/reclient": {
|
||||
"bootstrap_env": {
|
||||
"RBE_depsscan_connect_timeout": "120s"
|
||||
},
|
||||
"instance": "rbe-chromium-untrusted",
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"scandeps_server": true
|
||||
},
|
||||
"$build/siso": {
|
||||
"configs": [
|
||||
"builder"
|
||||
],
|
||||
"enable_cloud_monitoring": true,
|
||||
"enable_cloud_profiler": true,
|
||||
"enable_cloud_trace": true,
|
||||
"experiments": [],
|
||||
"metrics_project": "chromium-reclient-metrics",
|
||||
"project": "rbe-chromium-untrusted",
|
||||
"remote_jobs": 250
|
||||
}
|
||||
|
||||
@ -29,6 +29,7 @@ ci.defaults.set(
|
||||
contact_team_email = "chrome-desktop-engprod@google.com",
|
||||
execution_timeout = ci.DEFAULT_EXECUTION_TIMEOUT,
|
||||
health_spec = health_spec.DEFAULT,
|
||||
reclient_enabled = False,
|
||||
service_account = ci.DEFAULT_SERVICE_ACCOUNT,
|
||||
shadow_service_account = ci.DEFAULT_SHADOW_SERVICE_ACCOUNT,
|
||||
siso_enabled = True,
|
||||
|
||||
Reference in New Issue
Block a user