Revert "infra: Rollback Angle builders to Reclient"
This reverts commit 5ac56ea0f5594df37d9d4b01349e6c1c5d4442a0.
Reason for revert: Chromium->ANGLE rolling again
https://chromium-review.googlesource.com/c/angle/angle/+/6318007
Original change's description:
> infra: Rollback Angle builders to Reclient
>
> This CL partially reverts https://crrev.com/c/6301591 for Angle CI
> builders.
>
> Angle builders are failing for RBE authentication because the GN args
> changes aren't rolled out to Angle project due to crbug.com/400387818.
> https://ci.chromium.org/ui/p/chromium/builders/ci/android-angle-chromium-arm64-builder/158715/overview
>
> Bug: 400387818, 379584977
> Change-Id: I21819ea3f8821f173e005cb3df5bd04650a44b05
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6317605
> Commit-Queue: Junji Watanabe <jwata@google.com>
> Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1427071}
Bug: 400387818, 379584977
No-Try: true
Change-Id: Iade40860e36d1b3ab65c2555bed45a28c4304c72
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6316794
Auto-Submit: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#1427157}
diff --git a/infra/config/generated/builders/ci/android-angle-chromium-arm64-builder/gn-args.json b/infra/config/generated/builders/ci/android-angle-chromium-arm64-builder/gn-args.json
index 0ab89c0..3e79f6b 100644
--- a/infra/config/generated/builders/ci/android-angle-chromium-arm64-builder/gn-args.json
+++ b/infra/config/generated/builders/ci/android-angle-chromium-arm64-builder/gn-args.json
@@ -10,6 +10,7 @@
"symbol_level": 1,
"target_cpu": "arm64",
"target_os": "android",
+ "use_reclient": false,
"use_remoteexec": true,
"use_siso": true,
"use_static_angle": true
diff --git a/infra/config/generated/builders/ci/fuchsia-angle-builder/gn-args.json b/infra/config/generated/builders/ci/fuchsia-angle-builder/gn-args.json
index 22afe40..d7c33c4 100644
--- a/infra/config/generated/builders/ci/fuchsia-angle-builder/gn-args.json
+++ b/infra/config/generated/builders/ci/fuchsia-angle-builder/gn-args.json
@@ -7,6 +7,7 @@
"symbol_level": 1,
"target_cpu": "x64",
"target_os": "fuchsia",
+ "use_reclient": false,
"use_remoteexec": true,
"use_siso": true
}
diff --git a/infra/config/generated/builders/ci/ios-angle-builder/gn-args.json b/infra/config/generated/builders/ci/ios-angle-builder/gn-args.json
index 34b5a41..d70e2db2 100644
--- a/infra/config/generated/builders/ci/ios-angle-builder/gn-args.json
+++ b/infra/config/generated/builders/ci/ios-angle-builder/gn-args.json
@@ -9,6 +9,7 @@
"target_cpu": "x64",
"target_environment": "simulator",
"target_os": "ios",
+ "use_reclient": false,
"use_remoteexec": true,
"use_siso": true
}
diff --git a/infra/config/generated/builders/ci/linux-angle-chromium-builder/gn-args.json b/infra/config/generated/builders/ci/linux-angle-chromium-builder/gn-args.json
index 145d7af01..a206fb4a 100644
--- a/infra/config/generated/builders/ci/linux-angle-chromium-builder/gn-args.json
+++ b/infra/config/generated/builders/ci/linux-angle-chromium-builder/gn-args.json
@@ -8,6 +8,7 @@
"symbol_level": 1,
"target_cpu": "x64",
"target_os": "linux",
+ "use_reclient": false,
"use_remoteexec": true,
"use_siso": true
}
diff --git a/infra/config/generated/builders/ci/mac-angle-chromium-builder/gn-args.json b/infra/config/generated/builders/ci/mac-angle-chromium-builder/gn-args.json
index 7d56e91..901c0064 100644
--- a/infra/config/generated/builders/ci/mac-angle-chromium-builder/gn-args.json
+++ b/infra/config/generated/builders/ci/mac-angle-chromium-builder/gn-args.json
@@ -8,6 +8,7 @@
"symbol_level": 1,
"target_cpu": "x64",
"target_os": "mac",
+ "use_reclient": false,
"use_remoteexec": true,
"use_siso": true
}
diff --git a/infra/config/generated/builders/ci/win-angle-chromium-x64-builder/gn-args.json b/infra/config/generated/builders/ci/win-angle-chromium-x64-builder/gn-args.json
index 63a8c2327..0dcf61f 100644
--- a/infra/config/generated/builders/ci/win-angle-chromium-x64-builder/gn-args.json
+++ b/infra/config/generated/builders/ci/win-angle-chromium-x64-builder/gn-args.json
@@ -8,6 +8,7 @@
"symbol_level": 1,
"target_cpu": "x64",
"target_os": "win",
+ "use_reclient": false,
"use_remoteexec": true,
"use_siso": true
}
diff --git a/infra/config/generated/builders/ci/win-angle-chromium-x86-builder/gn-args.json b/infra/config/generated/builders/ci/win-angle-chromium-x86-builder/gn-args.json
index 1f2f0fc..a94ebd6 100644
--- a/infra/config/generated/builders/ci/win-angle-chromium-x86-builder/gn-args.json
+++ b/infra/config/generated/builders/ci/win-angle-chromium-x86-builder/gn-args.json
@@ -8,6 +8,7 @@
"symbol_level": 1,
"target_cpu": "x86",
"target_os": "win",
+ "use_reclient": false,
"use_remoteexec": true,
"use_siso": true
}
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
index 922d9f0..d8f8c98 100644
--- a/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -39511,18 +39511,15 @@
' "targets_spec_directory": "src/infra/config/generated/builders/ci/android-angle-chromium-arm64-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'
' },'
@@ -39592,18 +39589,15 @@
pool: "luci.chromium.try"
properties:
'{'
- ' "$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'
' }'
@@ -50640,18 +50634,15 @@
' "targets_spec_directory": "src/infra/config/generated/builders/ci/fuchsia-angle-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'
' },'
@@ -50721,18 +50712,15 @@
pool: "luci.chromium.try"
properties:
'{'
- ' "$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'
' }'
@@ -51792,18 +51780,15 @@
' "targets_spec_directory": "src/infra/config/generated/builders/ci/ios-angle-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'
' },'
@@ -51878,18 +51863,15 @@
pool: "luci.chromium.try"
properties:
'{'
- ' "$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'
' }'
@@ -54310,18 +54292,15 @@
' "targets_spec_directory": "src/infra/config/generated/builders/ci/linux-angle-chromium-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'
' },'
@@ -54391,18 +54370,15 @@
pool: "luci.chromium.try"
properties:
'{'
- ' "$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'
' }'
@@ -62067,18 +62043,15 @@
' "targets_spec_directory": "src/infra/config/generated/builders/ci/mac-angle-chromium-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'
' },'
@@ -62148,18 +62121,15 @@
pool: "luci.chromium.try"
properties:
'{'
- ' "$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'
' }'
@@ -68905,18 +68875,15 @@
' "targets_spec_directory": "src/infra/config/generated/builders/ci/win-angle-chromium-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": 80'
' },'
@@ -68986,18 +68953,15 @@
pool: "luci.chromium.try"
properties:
'{'
- ' "$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": 80'
' }'
@@ -69094,18 +69058,15 @@
' "targets_spec_directory": "src/infra/config/generated/builders/ci/win-angle-chromium-x86-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": 80'
' },'
@@ -69175,18 +69136,15 @@
pool: "luci.chromium.try"
properties:
'{'
- ' "$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": 80'
' }'
diff --git a/infra/config/subprojects/chromium/ci/chromium.angle.star b/infra/config/subprojects/chromium/ci/chromium.angle.star
index 3f5e835..a46e2d7 100644
--- a/infra/config/subprojects/chromium/ci/chromium.angle.star
+++ b/infra/config/subprojects/chromium/ci/chromium.angle.star
@@ -22,9 +22,7 @@
properties = {
"perf_dashboard_machine_group": "ChromiumANGLE",
},
- # TODO: crbug.com/400387818 - Fix chromium -> angle autoroller, otherwise
- # GN args and builder properties aren't synced.
- reclient_enabled = True,
+ reclient_enabled = False,
service_account = ci.gpu.SERVICE_ACCOUNT,
shadow_service_account = ci.gpu.SHADOW_SERVICE_ACCOUNT,
siso_enabled = True,
