infra: Migrate clang-tidy builders from Ninja/Reclient to Siso
Chromium uses Siso for compile now. The clang tidy builders also
should switch from Ninja/Reclient to Siso.
This CL adds use_siso=true GN arg and adds $build/siso properties to
the builders.
The corresponding recipe change: https://crrev.com/c/6618808
Bug: 379584977
Change-Id: I75949a389ea84dca8489da861a55b3e590890bf6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6620536
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Commit-Queue: Junji Watanabe <jwata@google.com>
Cr-Commit-Position: refs/heads/main@{#1469705}
diff --git a/infra/config/generated/builders/try/android-clang-tidy-rel/gn-args.json b/infra/config/generated/builders/try/android-clang-tidy-rel/gn-args.json
index 59bd985..1a42202b 100644
--- a/infra/config/generated/builders/try/android-clang-tidy-rel/gn-args.json
+++ b/infra/config/generated/builders/try/android-clang-tidy-rel/gn-args.json
@@ -11,6 +11,8 @@
"symbol_level": 0,
"target_cpu": "arm",
"target_os": "android",
- "use_remoteexec": true
+ "use_reclient": false,
+ "use_remoteexec": true,
+ "use_siso": true
}
}
\ No newline at end of file
diff --git a/infra/config/generated/builders/try/fuchsia-clang-tidy-rel/gn-args.json b/infra/config/generated/builders/try/fuchsia-clang-tidy-rel/gn-args.json
index ef5e5059..c30cb6e 100644
--- a/infra/config/generated/builders/try/fuchsia-clang-tidy-rel/gn-args.json
+++ b/infra/config/generated/builders/try/fuchsia-clang-tidy-rel/gn-args.json
@@ -6,6 +6,8 @@
"symbol_level": 0,
"target_cpu": "x64",
"target_os": "fuchsia",
- "use_remoteexec": true
+ "use_reclient": false,
+ "use_remoteexec": true,
+ "use_siso": true
}
}
\ No newline at end of file
diff --git a/infra/config/generated/builders/try/linux-chromeos-clang-tidy-rel/gn-args.json b/infra/config/generated/builders/try/linux-chromeos-clang-tidy-rel/gn-args.json
index e6a917ba..c499ec2 100644
--- a/infra/config/generated/builders/try/linux-chromeos-clang-tidy-rel/gn-args.json
+++ b/infra/config/generated/builders/try/linux-chromeos-clang-tidy-rel/gn-args.json
@@ -8,6 +8,8 @@
"symbol_level": 0,
"target_cpu": "x64",
"target_os": "chromeos",
- "use_remoteexec": true
+ "use_reclient": false,
+ "use_remoteexec": true,
+ "use_siso": true
}
}
\ No newline at end of file
diff --git a/infra/config/generated/builders/try/linux-clang-tidy-rel/gn-args.json b/infra/config/generated/builders/try/linux-clang-tidy-rel/gn-args.json
index 52e30ca..8d7dda7 100644
--- a/infra/config/generated/builders/try/linux-clang-tidy-rel/gn-args.json
+++ b/infra/config/generated/builders/try/linux-clang-tidy-rel/gn-args.json
@@ -6,6 +6,8 @@
"symbol_level": 0,
"target_cpu": "x64",
"target_os": "linux",
- "use_remoteexec": true
+ "use_reclient": false,
+ "use_remoteexec": true,
+ "use_siso": true
}
}
\ No newline at end of file
diff --git a/infra/config/generated/builders/try/mac-clang-tidy-rel/gn-args.json b/infra/config/generated/builders/try/mac-clang-tidy-rel/gn-args.json
index ff450e6..040e213 100644
--- a/infra/config/generated/builders/try/mac-clang-tidy-rel/gn-args.json
+++ b/infra/config/generated/builders/try/mac-clang-tidy-rel/gn-args.json
@@ -6,6 +6,8 @@
"symbol_level": 0,
"target_cpu": "x64",
"target_os": "mac",
- "use_remoteexec": true
+ "use_reclient": false,
+ "use_remoteexec": true,
+ "use_siso": true
}
}
\ No newline at end of file
diff --git a/infra/config/generated/builders/try/win10-clang-tidy-rel/gn-args.json b/infra/config/generated/builders/try/win10-clang-tidy-rel/gn-args.json
index bde0d27..2fc82a7 100644
--- a/infra/config/generated/builders/try/win10-clang-tidy-rel/gn-args.json
+++ b/infra/config/generated/builders/try/win10-clang-tidy-rel/gn-args.json
@@ -6,6 +6,8 @@
"symbol_level": 0,
"target_cpu": "x64",
"target_os": "win",
- "use_remoteexec": true
+ "use_reclient": false,
+ "use_remoteexec": true,
+ "use_siso": true
}
}
\ No newline at end of file
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
index d494a50..de92790 100644
--- a/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -83671,10 +83671,17 @@
}
properties:
'{'
- ' "$build/reclient": {'
- ' "instance": "rbe-chromium-untrusted",'
+ ' "$build/siso": {'
+ ' "configs": ['
+ ' "builder"'
+ ' ],'
+ ' "enable_cloud_monitoring": true,'
+ ' "enable_cloud_profiler": true,'
+ ' "enable_cloud_trace": true,'
+ ' "experiments": [],'
' "metrics_project": "chromium-reclient-metrics",'
- ' "scandeps_server": true'
+ ' "project": "rbe-chromium-untrusted",'
+ ' "remote_jobs": 150'
' },'
' "$recipe_engine/resultdb/test_presentation": {'
' "column_keys": [],'
@@ -96678,10 +96685,17 @@
}
properties:
'{'
- ' "$build/reclient": {'
- ' "instance": "rbe-chromium-untrusted",'
+ ' "$build/siso": {'
+ ' "configs": ['
+ ' "builder"'
+ ' ],'
+ ' "enable_cloud_monitoring": true,'
+ ' "enable_cloud_profiler": true,'
+ ' "enable_cloud_trace": true,'
+ ' "experiments": [],'
' "metrics_project": "chromium-reclient-metrics",'
- ' "scandeps_server": true'
+ ' "project": "rbe-chromium-untrusted",'
+ ' "remote_jobs": 150'
' },'
' "$recipe_engine/resultdb/test_presentation": {'
' "column_keys": [],'
@@ -109730,10 +109744,17 @@
}
properties:
'{'
- ' "$build/reclient": {'
- ' "instance": "rbe-chromium-untrusted",'
+ ' "$build/siso": {'
+ ' "configs": ['
+ ' "builder"'
+ ' ],'
+ ' "enable_cloud_monitoring": true,'
+ ' "enable_cloud_profiler": true,'
+ ' "enable_cloud_trace": true,'
+ ' "experiments": [],'
' "metrics_project": "chromium-reclient-metrics",'
- ' "scandeps_server": true'
+ ' "project": "rbe-chromium-untrusted",'
+ ' "remote_jobs": -1'
' },'
' "$recipe_engine/resultdb/test_presentation": {'
' "column_keys": [],'
@@ -110510,10 +110531,17 @@
}
properties:
'{'
- ' "$build/reclient": {'
- ' "instance": "rbe-chromium-untrusted",'
+ ' "$build/siso": {'
+ ' "configs": ['
+ ' "builder"'
+ ' ],'
+ ' "enable_cloud_monitoring": true,'
+ ' "enable_cloud_profiler": true,'
+ ' "enable_cloud_trace": true,'
+ ' "experiments": [],'
' "metrics_project": "chromium-reclient-metrics",'
- ' "scandeps_server": true'
+ ' "project": "rbe-chromium-untrusted",'
+ ' "remote_jobs": -1'
' },'
' "$recipe_engine/resultdb/test_presentation": {'
' "column_keys": [],'
@@ -119314,10 +119342,17 @@
}
properties:
'{'
- ' "$build/reclient": {'
- ' "instance": "rbe-chromium-untrusted",'
+ ' "$build/siso": {'
+ ' "configs": ['
+ ' "builder"'
+ ' ],'
+ ' "enable_cloud_monitoring": true,'
+ ' "enable_cloud_profiler": true,'
+ ' "enable_cloud_trace": true,'
+ ' "experiments": [],'
' "metrics_project": "chromium-reclient-metrics",'
- ' "scandeps_server": true'
+ ' "project": "rbe-chromium-untrusted",'
+ ' "remote_jobs": -1'
' },'
' "$recipe_engine/resultdb/test_presentation": {'
' "column_keys": [],'
@@ -125827,10 +125862,17 @@
' "check_for_flakiness": true,'
' "check_for_flakiness_with_resultdb": true'
' },'
- ' "$build/reclient": {'
- ' "instance": "rbe-chromium-untrusted",'
+ ' "$build/siso": {'
+ ' "configs": ['
+ ' "builder"'
+ ' ],'
+ ' "enable_cloud_monitoring": true,'
+ ' "enable_cloud_profiler": true,'
+ ' "enable_cloud_trace": true,'
+ ' "experiments": [],'
' "metrics_project": "chromium-reclient-metrics",'
- ' "scandeps_server": true'
+ ' "project": "rbe-chromium-untrusted",'
+ ' "remote_jobs": 150'
' },'
' "$recipe_engine/resultdb/test_presentation": {'
' "column_keys": [],'
@@ -130370,10 +130412,17 @@
}
properties:
'{'
- ' "$build/reclient": {'
- ' "instance": "rbe-chromium-untrusted",'
+ ' "$build/siso": {'
+ ' "configs": ['
+ ' "builder"'
+ ' ],'
+ ' "enable_cloud_monitoring": true,'
+ ' "enable_cloud_profiler": true,'
+ ' "enable_cloud_trace": true,'
+ ' "experiments": [],'
' "metrics_project": "chromium-reclient-metrics",'
- ' "scandeps_server": true'
+ ' "project": "rbe-chromium-untrusted",'
+ ' "remote_jobs": 150'
' },'
' "$recipe_engine/resultdb/test_presentation": {'
' "column_keys": [],'
diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.tricium.star b/infra/config/subprojects/chromium/try/tryserver.chromium.tricium.star
index 2c5f4ea..d643a86 100644
--- a/infra/config/subprojects/chromium/try/tryserver.chromium.tricium.star
+++ b/infra/config/subprojects/chromium/try/tryserver.chromium.tricium.star
@@ -17,9 +17,10 @@
cores = 8,
execution_timeout = try_.DEFAULT_EXECUTION_TIMEOUT,
orchestrator_cores = 2,
+ reclient_enabled = False,
service_account = try_.DEFAULT_SERVICE_ACCOUNT,
+ siso_enabled = True,
siso_project = siso.project.DEFAULT_UNTRUSTED,
- # TODO: b/336209927 - Migrate tricium_clang_tidy_script.py to Siso.
siso_remote_jobs = siso.remote_jobs.LOW_JOBS_FOR_CQ,
# Make each bot specify its own OS, since we have a variety of these in this
