Add reclient defaults to angle and tricium star files
This should be a noop as none of these builders use a reclient config yet
Change-Id: Ib28ae5c782f6bac1b8f86b42acdeb665a2645e7e
Bug: b/242733354
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3869164
Auto-Submit: Ben Segall <bentekkie@google.com>
Commit-Queue: Ben Segall <bentekkie@google.com>
Reviewed-by: Garrett Beaty <gbeaty@google.com>
Cr-Commit-Position: refs/heads/main@{#1043514}
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg
index 3e99aade..a778a6c 100644
--- a/infra/config/generated/luci/cr-buildbucket.cfg
+++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -51407,6 +51407,11 @@
' "server_host": "goma.chromium.org",'
' "use_luci_auth": true'
' },'
+ ' "$build/reclient": {'
+ ' "instance": "rbe-chromium-untrusted",'
+ ' "jobs": 150,'
+ ' "metrics_project": "chromium-reclient-metrics"'
+ ' },'
' "$recipe_engine/resultdb/test_presentation": {'
' "column_keys": [],'
' "grouping_keys": ['
@@ -51957,6 +51962,11 @@
' "server_host": "goma.chromium.org",'
' "use_luci_auth": true'
' },'
+ ' "$build/reclient": {'
+ ' "instance": "rbe-chromium-untrusted",'
+ ' "jobs": 150,'
+ ' "metrics_project": "chromium-reclient-metrics"'
+ ' },'
' "$recipe_engine/resultdb/test_presentation": {'
' "column_keys": [],'
' "grouping_keys": ['
@@ -60119,6 +60129,11 @@
' "server_host": "goma.chromium.org",'
' "use_luci_auth": true'
' },'
+ ' "$build/reclient": {'
+ ' "instance": "rbe-chromium-untrusted",'
+ ' "jobs": 150,'
+ ' "metrics_project": "chromium-reclient-metrics"'
+ ' },'
' "$recipe_engine/resultdb/test_presentation": {'
' "column_keys": [],'
' "grouping_keys": ['
@@ -60384,6 +60399,11 @@
' "server_host": "goma.chromium.org",'
' "use_luci_auth": true'
' },'
+ ' "$build/reclient": {'
+ ' "instance": "rbe-chromium-untrusted",'
+ ' "jobs": 150,'
+ ' "metrics_project": "chromium-reclient-metrics"'
+ ' },'
' "$recipe_engine/resultdb/test_presentation": {'
' "column_keys": [],'
' "grouping_keys": ['
@@ -65930,6 +65950,11 @@
' "server_host": "goma.chromium.org",'
' "use_luci_auth": true'
' },'
+ ' "$build/reclient": {'
+ ' "instance": "rbe-chromium-untrusted",'
+ ' "jobs": 150,'
+ ' "metrics_project": "chromium-reclient-metrics"'
+ ' },'
' "$recipe_engine/resultdb/test_presentation": {'
' "column_keys": [],'
' "grouping_keys": ['
@@ -68048,6 +68073,11 @@
' "server_host": "goma.chromium.org",'
' "use_luci_auth": true'
' },'
+ ' "$build/reclient": {'
+ ' "instance": "rbe-chromium-untrusted",'
+ ' "jobs": 150,'
+ ' "metrics_project": "chromium-reclient-metrics"'
+ ' },'
' "$recipe_engine/resultdb/test_presentation": {'
' "column_keys": [],'
' "grouping_keys": ['
@@ -69032,6 +69062,11 @@
' "server_host": "goma.chromium.org",'
' "use_luci_auth": true'
' },'
+ ' "$build/reclient": {'
+ ' "instance": "rbe-chromium-untrusted",'
+ ' "jobs": 150,'
+ ' "metrics_project": "chromium-reclient-metrics"'
+ ' },'
' "$recipe_engine/resultdb/test_presentation": {'
' "column_keys": [],'
' "grouping_keys": ['
@@ -69760,6 +69795,11 @@
' "server_host": "goma.chromium.org",'
' "use_luci_auth": true'
' },'
+ ' "$build/reclient": {'
+ ' "instance": "rbe-chromium-untrusted",'
+ ' "jobs": 150,'
+ ' "metrics_project": "chromium-reclient-metrics"'
+ ' },'
' "$recipe_engine/resultdb/test_presentation": {'
' "column_keys": [],'
' "grouping_keys": ['
@@ -69844,6 +69884,11 @@
' "server_host": "goma.chromium.org",'
' "use_luci_auth": true'
' },'
+ ' "$build/reclient": {'
+ ' "instance": "rbe-chromium-untrusted",'
+ ' "jobs": 150,'
+ ' "metrics_project": "chromium-reclient-metrics"'
+ ' },'
' "$recipe_engine/resultdb/test_presentation": {'
' "column_keys": [],'
' "grouping_keys": ['
@@ -70736,6 +70781,11 @@
' "server_host": "goma.chromium.org",'
' "use_luci_auth": true'
' },'
+ ' "$build/reclient": {'
+ ' "instance": "rbe-chromium-untrusted",'
+ ' "jobs": 150,'
+ ' "metrics_project": "chromium-reclient-metrics"'
+ ' },'
' "$recipe_engine/resultdb/test_presentation": {'
' "column_keys": [],'
' "grouping_keys": ['
@@ -75739,6 +75789,11 @@
' "server_host": "goma.chromium.org",'
' "use_luci_auth": true'
' },'
+ ' "$build/reclient": {'
+ ' "instance": "rbe-chromium-untrusted",'
+ ' "jobs": 150,'
+ ' "metrics_project": "chromium-reclient-metrics"'
+ ' },'
' "$recipe_engine/resultdb/test_presentation": {'
' "column_keys": [],'
' "grouping_keys": ['
@@ -75999,6 +76054,11 @@
' "server_host": "goma.chromium.org",'
' "use_luci_auth": true'
' },'
+ ' "$build/reclient": {'
+ ' "instance": "rbe-chromium-untrusted",'
+ ' "jobs": 150,'
+ ' "metrics_project": "chromium-reclient-metrics"'
+ ' },'
' "$recipe_engine/resultdb/test_presentation": {'
' "column_keys": [],'
' "grouping_keys": ['
@@ -79266,6 +79326,11 @@
}
properties:
'{'
+ ' "$build/reclient": {'
+ ' "instance": "rbe-chromium-untrusted",'
+ ' "jobs": 150,'
+ ' "metrics_project": "chromium-reclient-metrics"'
+ ' },'
' "$recipe_engine/resultdb/test_presentation": {'
' "column_keys": [],'
' "grouping_keys": ['
@@ -79704,6 +79769,11 @@
' "server_host": "goma.chromium.org",'
' "use_luci_auth": true'
' },'
+ ' "$build/reclient": {'
+ ' "instance": "rbe-chromium-untrusted",'
+ ' "jobs": 150,'
+ ' "metrics_project": "chromium-reclient-metrics"'
+ ' },'
' "$recipe_engine/resultdb/test_presentation": {'
' "column_keys": [],'
' "grouping_keys": ['
@@ -79787,6 +79857,11 @@
' "server_host": "goma.chromium.org",'
' "use_luci_auth": true'
' },'
+ ' "$build/reclient": {'
+ ' "instance": "rbe-chromium-untrusted",'
+ ' "jobs": 150,'
+ ' "metrics_project": "chromium-reclient-metrics"'
+ ' },'
' "$recipe_engine/resultdb/test_presentation": {'
' "column_keys": [],'
' "grouping_keys": ['
@@ -81097,6 +81172,11 @@
' "server_host": "goma.chromium.org",'
' "use_luci_auth": true'
' },'
+ ' "$build/reclient": {'
+ ' "instance": "rbe-chromium-untrusted",'
+ ' "jobs": 150,'
+ ' "metrics_project": "chromium-reclient-metrics"'
+ ' },'
' "$recipe_engine/resultdb/test_presentation": {'
' "column_keys": [],'
' "grouping_keys": ['
diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.angle.star b/infra/config/subprojects/chromium/try/tryserver.chromium.angle.star
index 143c413..73f5669 100644
--- a/infra/config/subprojects/chromium/try/tryserver.chromium.angle.star
+++ b/infra/config/subprojects/chromium/try/tryserver.chromium.angle.star
@@ -3,7 +3,7 @@
# found in the LICENSE file.
"""Definitions of builders in the tryserver.chromium.angle builder group."""
-load("//lib/builders.star", "goma", "os")
+load("//lib/builders.star", "goma", "os", "reclient")
load("//lib/consoles.star", "consoles")
load("//lib/try.star", "try_")
@@ -15,6 +15,8 @@
execution_timeout = try_.DEFAULT_EXECUTION_TIMEOUT,
goma_backend = goma.backend.RBE_PROD,
goma_jobs = goma.jobs.J150,
+ reclient_instance = reclient.instance.DEFAULT_UNTRUSTED,
+ reclient_jobs = reclient.jobs.LOW_JOBS_FOR_CQ,
os = os.LINUX_DEFAULT,
pool = try_.DEFAULT_POOL,
service_account = try_.gpu.SERVICE_ACCOUNT,
diff --git a/infra/config/subprojects/chromium/try/tryserver.chromium.tricium.star b/infra/config/subprojects/chromium/try/tryserver.chromium.tricium.star
index c49fc32f..e16cff5b3 100644
--- a/infra/config/subprojects/chromium/try/tryserver.chromium.tricium.star
+++ b/infra/config/subprojects/chromium/try/tryserver.chromium.tricium.star
@@ -3,7 +3,7 @@
# found in the LICENSE file.
"""Definitions of builders used by Tricium for Chromium."""
-load("//lib/builders.star", "goma", "os", "xcode")
+load("//lib/builders.star", "goma", "os", "reclient", "xcode")
load("//lib/consoles.star", "consoles")
load("//lib/try.star", "SOURCELESS_BUILDER_CACHES", "try_")
@@ -16,6 +16,8 @@
execution_timeout = try_.DEFAULT_EXECUTION_TIMEOUT,
goma_backend = goma.backend.RBE_PROD,
goma_jobs = goma.jobs.J150,
+ reclient_instance = reclient.instance.DEFAULT_UNTRUSTED,
+ reclient_jobs = reclient.jobs.LOW_JOBS_FOR_CQ,
pool = try_.DEFAULT_POOL,
service_account = try_.DEFAULT_SERVICE_ACCOUNT,
