infra: Migrate node-ci builders from Ninja/Reclient to Siso
The node CI builder on V8 migrated successfully.
https://crrev.com/c/6636276
This CL migrates the remaining builders on node-ci project side.
Bug: 414724525
Change-Id: I6ca8e585a0c3ae477e60c968a5cb3f7af2e475ac
Reviewed-on: https://chromium-review.googlesource.com/c/v8/node-ci/+/6636351
Reviewed-by: Matthias Liedtke <mliedtke@chromium.org>
Commit-Queue: Junji Watanabe <jwata@google.com>
Reviewed-by: Victor Gomes <victorgomes@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index b6ac389..dc33d33 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -31,9 +31,14 @@
}
properties:
'{'
- ' "$build/reclient": {'
- ' "instance": "rbe-chromium-trusted",'
- ' "metrics_project": "chromium-reclient-metrics"'
+ ' "$build/siso": {'
+ ' "configs": ['
+ ' "builder"'
+ ' ],'
+ ' "enable_cloud_monitoring": true,'
+ ' "enable_cloud_profiler": true,'
+ ' "enable_cloud_trace": true,'
+ ' "project": "rbe-chromium-trusted"'
' },'
' "$build/v8": {'
' "use_remoteexec": true'
@@ -58,9 +63,14 @@
}
properties:
'{'
- ' "$build/reclient": {'
- ' "instance": "rbe-chromium-trusted",'
- ' "metrics_project": "chromium-reclient-metrics"'
+ ' "$build/siso": {'
+ ' "configs": ['
+ ' "builder"'
+ ' ],'
+ ' "enable_cloud_monitoring": true,'
+ ' "enable_cloud_profiler": true,'
+ ' "enable_cloud_trace": true,'
+ ' "project": "rbe-chromium-trusted"'
' },'
' "$build/v8": {'
' "use_remoteexec": true'
@@ -117,9 +127,14 @@
}
properties:
'{'
- ' "$build/reclient": {'
- ' "instance": "rbe-chromium-untrusted",'
- ' "metrics_project": "chromium-reclient-metrics"'
+ ' "$build/siso": {'
+ ' "configs": ['
+ ' "builder"'
+ ' ],'
+ ' "enable_cloud_monitoring": true,'
+ ' "enable_cloud_profiler": true,'
+ ' "enable_cloud_trace": true,'
+ ' "project": "rbe-chromium-untrusted"'
' },'
' "$build/v8": {'
' "use_remoteexec": true'
@@ -144,9 +159,14 @@
}
properties:
'{'
- ' "$build/reclient": {'
- ' "instance": "rbe-chromium-untrusted",'
- ' "metrics_project": "chromium-reclient-metrics"'
+ ' "$build/siso": {'
+ ' "configs": ['
+ ' "builder"'
+ ' ],'
+ ' "enable_cloud_monitoring": true,'
+ ' "enable_cloud_profiler": true,'
+ ' "enable_cloud_trace": true,'
+ ' "project": "rbe-chromium-untrusted"'
' },'
' "$build/v8": {'
' "use_remoteexec": true'
diff --git a/generated/project.cfg b/generated/project.cfg
index 1135184..4cf9412 100644
--- a/generated/project.cfg
+++ b/generated/project.cfg
@@ -7,7 +7,7 @@
name: "node-ci"
access: "group:all"
lucicfg {
- version: "1.43.13"
+ version: "1.45.3"
package_dir: ".."
config_dir: "generated"
entry_point: "main.star"
diff --git a/main.star b/main.star
index 72f5dd8..2911ff8 100755
--- a/main.star
+++ b/main.star
@@ -261,19 +261,22 @@
use_bbagent = True,
)
-def reclient_properties(instance):
+def siso_properties(instance):
return {
- "$build/reclient": {
- "instance": instance,
- "metrics_project": "chromium-reclient-metrics",
+ "$build/siso": {
+ "project": instance,
+ "configs": ["builder"],
+ "enable_cloud_monitoring": True,
+ "enable_cloud_profiler": True,
+ "enable_cloud_trace": True,
},
"$build/v8": {
"use_remoteexec": True,
},
}
-RECLIENT_CI = reclient_properties("rbe-chromium-trusted")
-RECLIENT_TRY = reclient_properties("rbe-chromium-untrusted")
+RBE_CI = siso_properties("rbe-chromium-trusted")
+RBE_TRY = siso_properties("rbe-chromium-untrusted")
DEFAULT_ARGS = {
"executable": recipe("v8/node_integration_ng"),
@@ -306,7 +309,7 @@
ci_builder(
name = ci_name,
os = os,
- properties = dict(RECLIENT_CI, is_debug = is_debug),
+ properties = dict(RBE_CI, is_debug = is_debug),
execution_timeout = time.hour,
)
luci.console_view_entry(builder = ci_name, console_view = "main")
@@ -314,7 +317,7 @@
try_builder(
name = try_name,
os = os,
- properties = dict(RECLIENT_TRY, is_debug = is_debug),
+ properties = dict(RBE_TRY, is_debug = is_debug),
execution_timeout = time.hour,
)
luci.list_view_entry(builder = try_name, list_view = "tryserver")
