diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-05-17 17:24:03 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-06-22 07:51:41 +0000 |
commit | 774f54339e5db91f785733232d3950366db65d07 (patch) | |
tree | 068e1b47bd1af94d77094ed12b604a6b83d9c22a /chromium/infra/config/lib | |
parent | f7eaed5286974984ba5f9e3189d8f49d03e99f81 (diff) | |
download | qtwebengine-chromium-774f54339e5db91f785733232d3950366db65d07.tar.gz |
BASELINE: Update Chromium to 102.0.5005.57
Change-Id: I885f714bb40ee724c28f94ca6bd8dbdb39915158
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/infra/config/lib')
-rw-r--r-- | chromium/infra/config/lib/builders.star | 22 | ||||
-rw-r--r-- | chromium/infra/config/lib/sheriff_rotations.star | 43 |
2 files changed, 63 insertions, 2 deletions
diff --git a/chromium/infra/config/lib/builders.star b/chromium/infra/config/lib/builders.star index 8fda6b26692..24a04513f57 100644 --- a/chromium/infra/config/lib/builders.star +++ b/chromium/infra/config/lib/builders.star @@ -31,6 +31,7 @@ load("./branches.star", "branches") load("./bootstrap.star", "register_bootstrap") load("./builder_config.star", "register_builder_config") load("./recipe_experiments.star", "register_recipe_experiments_ref") +load("./sheriff_rotations.star", "register_sheriffed_builder") ################################################################################ # Constants for use with the builder function # @@ -164,7 +165,7 @@ xcode = struct( # Default Xcode 13 for chromium iOS. x13main = xcode_enum("13c100"), # A newer Xcode version used on beta bots. - x13betabots = xcode_enum("13c100"), + x13betabots = xcode_enum("13e5104i"), # in use by ios-webkit-tot x13wk = xcode_enum("13a1030dwk"), ) @@ -208,7 +209,8 @@ def _code_coverage_property( use_java_coverage, use_javascript_coverage, coverage_exclude_sources, - coverage_test_types): + coverage_test_types, + export_coverage_to_zoss): code_coverage = {} use_clang_coverage = defaults.get_value( @@ -240,6 +242,13 @@ def _code_coverage_property( if coverage_test_types: code_coverage["coverage_test_types"] = coverage_test_types + export_coverage_to_zoss = defaults.get_value( + "export_coverage_to_zoss", + export_coverage_to_zoss, + ) + if export_coverage_to_zoss: + code_coverage["export_coverage_to_zoss"] = export_coverage_to_zoss + return code_coverage or None def _reclient_property(*, instance, service, jobs, rewrapper_env, profiler_service, publish_trace, cache_silo, ensure_verified): @@ -305,6 +314,7 @@ defaults = args.defaults( use_javascript_coverage = False, coverage_exclude_sources = None, coverage_test_types = None, + export_coverage_to_zoss = False, resultdb_bigquery_exports = [], resultdb_index_by_timestamp = False, reclient_instance = None, @@ -360,6 +370,7 @@ def builder( use_javascript_coverage = args.DEFAULT, coverage_exclude_sources = args.DEFAULT, coverage_test_types = args.DEFAULT, + export_coverage_to_zoss = args.DEFAULT, resultdb_bigquery_exports = args.DEFAULT, resultdb_index_by_timestamp = args.DEFAULT, reclient_instance = args.DEFAULT, @@ -501,6 +512,10 @@ def builder( coverage_test_types: a list of string as test types to process data for in code_coverage recipe module. Will be copied to '$build/code_coverage' property. By default, considered None. + export_coverage_to_zoss: a boolean indicating if the raw coverage data + be exported zoss(and eventually in code search) in code_coverage + recipe module. Will be copied to '$build/code_coverage' property + if set. Be default, considered False. resultdb_bigquery_exports: a list of resultdb.export_test_results(...) specifying parameters for exporting test results to BigQuery. By default, do not export. @@ -656,6 +671,7 @@ def builder( use_javascript_coverage = use_javascript_coverage, coverage_exclude_sources = coverage_exclude_sources, coverage_test_types = coverage_test_types, + export_coverage_to_zoss = export_coverage_to_zoss, ) if code_coverage != None: properties["$build/code_coverage"] = code_coverage @@ -724,6 +740,8 @@ def builder( if builder == None: return None + register_sheriffed_builder(bucket, name, sheriff_rotations) + register_recipe_experiments_ref(bucket, name, executable) register_builder_config(bucket, name, builder_group, builder_spec, mirrors, try_settings) diff --git a/chromium/infra/config/lib/sheriff_rotations.star b/chromium/infra/config/lib/sheriff_rotations.star new file mode 100644 index 00000000000..f3f306daa64 --- /dev/null +++ b/chromium/infra/config/lib/sheriff_rotations.star @@ -0,0 +1,43 @@ +# Copyright 2022 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +"""Library for registering builders to sheriff_rotations.""" + +load("@stdlib//internal/graph.star", "graph") +load("@stdlib//internal/luci/common.star", "keys") +load("./nodes.star", "nodes") +load("//project.star", "settings") + +_SHERIFF_ROTATION = nodes.create_unscoped_node_type("sheriff_rotation") + +_SHERIFFED_BUILDER = nodes.create_bucket_scoped_node_type("sheriffed_builder") + +def register_sheriffed_builder(bucket, builder, sheriff_rotations): + """Register a builder with its sheriff rotations. + + Args: + bucket: The name of the bucket of the builder. + builder: The name of the builder. + sheriff_rotations: A list of the names of sheriff rotations the builder + is a part of. + """ + sheriffed_builder_key = _SHERIFFED_BUILDER.add(bucket, builder) + for s in sheriff_rotations: + sheriff_rotation_key = _SHERIFF_ROTATION.add(s, idempotent = True) + graph.add_edge(sheriff_rotation_key, sheriffed_builder_key) + graph.add_edge(keys.project(), sheriff_rotation_key) + +def _generate_sheriff_rotations_files(ctx): + if not settings.is_main: + return + + for sheriff_rotation_node in graph.children(keys.project(), _SHERIFF_ROTATION.kind): + sheriffed_builders = [] + for sheriffed_builder_node in graph.children(sheriff_rotation_node.key, _SHERIFFED_BUILDER.kind): + key = sheriffed_builder_node.key + sheriffed_builders.append("{}/{}".format(key.container.id, key.id)) + sheriff_rotation_file = "sheriff-rotations/{}.txt".format(sheriff_rotation_node.key.id) + ctx.output[sheriff_rotation_file] = "".join(["{}\n".format(b) for b in sorted(sheriffed_builders)]) + +lucicfg.generator(_generate_sheriff_rotations_files) |