upload cloudtrace from Win x64 Builder (reclient)(cross)
Bug: 1220997 Change-Id: Ia8d92e71bc2d6803d69effe678e447d820b14254 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2971965 Auto-Submit: Fumitoshi Ukai <ukai@google.com> Commit-Queue: Dirk Pranke <dpranke@google.com> Reviewed-by: Yoshisato Yanagisawa <yyanagisawa@google.com> Reviewed-by: Dirk Pranke <dpranke@google.com> Cr-Commit-Position: refs/heads/master@{#893924}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
637fe782c7
commit
afbdfd2632
infra/config
@ -17868,7 +17868,7 @@ buckets {
|
|||||||
name: "chromium"
|
name: "chromium"
|
||||||
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
|
cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
|
||||||
cipd_version: "refs/heads/master"
|
cipd_version: "refs/heads/master"
|
||||||
properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"metrics_project\":\"chromium-reclient-metrics\",\"profiler_service\":\"reclient-win\"}"
|
properties_j: "$build/reclient:{\"instance\":\"rbe-chromium-trusted\",\"metrics_project\":\"chromium-reclient-metrics\",\"profiler_service\":\"reclient-win\",\"publish_trace\":true}"
|
||||||
properties_j: "$kitchen:{\"devshell\":true,\"emulate_gce\":true,\"git_auth\":true}"
|
properties_j: "$kitchen:{\"devshell\":true,\"emulate_gce\":true,\"git_auth\":true}"
|
||||||
properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
|
properties_j: "$recipe_engine/isolated:{\"server\":\"https://isolateserver.appspot.com\"}"
|
||||||
properties_j: "$recipe_engine/resultdb/test_presentation:{\"column_keys\":[],\"grouping_keys\":[\"status\",\"v.test_suite\"]}"
|
properties_j: "$recipe_engine/resultdb/test_presentation:{\"column_keys\":[],\"grouping_keys\":[\"status\",\"v.test_suite\"]}"
|
||||||
|
@ -265,7 +265,7 @@ def _isolated_property(*, isolated_server):
|
|||||||
|
|
||||||
return isolated or None
|
return isolated or None
|
||||||
|
|
||||||
def _reclient_property(*, instance, service, jobs, rewrapper_env, profiler_service):
|
def _reclient_property(*, instance, service, jobs, rewrapper_env, profiler_service, publish_trace):
|
||||||
reclient = {}
|
reclient = {}
|
||||||
instance = defaults.get_value("reclient_instance", instance)
|
instance = defaults.get_value("reclient_instance", instance)
|
||||||
if instance:
|
if instance:
|
||||||
@ -287,6 +287,9 @@ def _reclient_property(*, instance, service, jobs, rewrapper_env, profiler_servi
|
|||||||
profiler_service = defaults.get_value("reclient_profiler_service", profiler_service)
|
profiler_service = defaults.get_value("reclient_profiler_service", profiler_service)
|
||||||
if profiler_service:
|
if profiler_service:
|
||||||
reclient["profiler_service"] = profiler_service
|
reclient["profiler_service"] = profiler_service
|
||||||
|
publish_trace = defaults.get_value("reclient_publish_trace", publish_trace)
|
||||||
|
if publish_trace:
|
||||||
|
reclient["publish_trace"] = True
|
||||||
return reclient or None
|
return reclient or None
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
@ -329,6 +332,7 @@ defaults = args.defaults(
|
|||||||
reclient_jobs = None,
|
reclient_jobs = None,
|
||||||
reclient_rewrapper_env = None,
|
reclient_rewrapper_env = None,
|
||||||
reclient_profiler_service = None,
|
reclient_profiler_service = None,
|
||||||
|
reclient_publish_trace = None,
|
||||||
|
|
||||||
# Provide vars for bucket and executable so users don't have to
|
# Provide vars for bucket and executable so users don't have to
|
||||||
# unnecessarily make wrapper functions
|
# unnecessarily make wrapper functions
|
||||||
@ -376,6 +380,7 @@ def builder(
|
|||||||
reclient_jobs = args.DEFAULT,
|
reclient_jobs = args.DEFAULT,
|
||||||
reclient_rewrapper_env = args.DEFAULT,
|
reclient_rewrapper_env = args.DEFAULT,
|
||||||
reclient_profiler_service = args.DEFAULT,
|
reclient_profiler_service = args.DEFAULT,
|
||||||
|
reclient_publish_trace = args.DEFAULT,
|
||||||
experiments = None,
|
experiments = None,
|
||||||
**kwargs):
|
**kwargs):
|
||||||
"""Define a builder.
|
"""Define a builder.
|
||||||
@ -511,6 +516,7 @@ def builder(
|
|||||||
environment variables. All such vars must start with the "RBE_" prefix.
|
environment variables. All such vars must start with the "RBE_" prefix.
|
||||||
* reclient_profiler_service - a string indicating service name for
|
* reclient_profiler_service - a string indicating service name for
|
||||||
re-client's cloud profiler.
|
re-client's cloud profiler.
|
||||||
|
* reclient_publish_trace - If True, it publish trace by rpl2cloudtrace.
|
||||||
* experiments - a dict of experiment name to the percentage chance (0-100)
|
* experiments - a dict of experiment name to the percentage chance (0-100)
|
||||||
that it will apply to builds generated from this builder.
|
that it will apply to builds generated from this builder.
|
||||||
* kwargs - Additional keyword arguments to forward on to `luci.builder`.
|
* kwargs - Additional keyword arguments to forward on to `luci.builder`.
|
||||||
@ -657,6 +663,7 @@ def builder(
|
|||||||
jobs = reclient_jobs,
|
jobs = reclient_jobs,
|
||||||
rewrapper_env = reclient_rewrapper_env,
|
rewrapper_env = reclient_rewrapper_env,
|
||||||
profiler_service = reclient_profiler_service,
|
profiler_service = reclient_profiler_service,
|
||||||
|
publish_trace = reclient_publish_trace,
|
||||||
)
|
)
|
||||||
if reclient != None:
|
if reclient != None:
|
||||||
properties["$build/reclient"] = reclient
|
properties["$build/reclient"] = reclient
|
||||||
|
@ -4049,6 +4049,7 @@ ci.fyi_windows_builder(
|
|||||||
goma_backend = None,
|
goma_backend = None,
|
||||||
reclient_instance = "rbe-chromium-trusted",
|
reclient_instance = "rbe-chromium-trusted",
|
||||||
reclient_profiler_service = "reclient-win",
|
reclient_profiler_service = "reclient-win",
|
||||||
|
reclient_publish_trace = True,
|
||||||
configure_kitchen = True,
|
configure_kitchen = True,
|
||||||
kitchen_emulate_gce = True,
|
kitchen_emulate_gce = True,
|
||||||
os = os.WINDOWS_DEFAULT,
|
os = os.WINDOWS_DEFAULT,
|
||||||
|
Reference in New Issue
Block a user