diff options
Diffstat (limited to 'chromium/infra/config/subprojects')
36 files changed, 1740 insertions, 476 deletions
diff --git a/chromium/infra/config/subprojects/chromium/ci.star b/chromium/infra/config/subprojects/chromium/ci.star index 671ee3cd152..7858a31e419 100644 --- a/chromium/infra/config/subprojects/chromium/ci.star +++ b/chromium/infra/config/subprojects/chromium/ci.star @@ -1,13 +1,22 @@ +# Copyright 2020 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. + load('//lib/builders.star', 'builder_name', 'cpu', 'goma', 'os') load('//lib/ci.star', 'ci') load('//project.star', 'settings') +def main_console_if_on_branch(): + return None if settings.is_master else settings.main_console_name + + ci.set_defaults( settings, add_to_console_view = True, bucketed_triggers = settings.is_master, - main_console_view = settings.main_console_name, + main_console_view = None if settings.is_master else settings.main_console_name, + cq_mirrors_console_view = settings.cq_mirrors_console_name, ) ci.declare_bucket(settings) @@ -18,7 +27,14 @@ ci.declare_bucket(settings) ci.console_view( name = 'chromium', include_experimental_builds = True, - ordering = {}, + ordering = { + '*type*': ci.ordering(short_names=['dbg', 'rel', 'off']), + 'android':'*type*', + 'fuchsia':'*type*', + 'linux':'*type*', + 'mac':'*type*', + 'win':'*type*', + }, ) ci.console_view( @@ -419,6 +435,22 @@ ci.android_builder( ) ci.android_builder( + name = 'android-marshmallow-x86-rel', + console_view_entry = ci.console_view_entry( + category = 'builder_tester|x86', + short_name = 'M', + ), +) + +ci.android_builder( + name = 'android-nougat-arm64-rel', + console_view_entry = ci.console_view_entry( + category = 'builder_tester|arm64', + short_name = 'N', + ), +) + +ci.android_builder( name = 'android-pie-arm64-dbg', console_view_entry = ci.console_view_entry( category = 'tester|phone', @@ -435,6 +467,47 @@ ci.android_builder( ), ) +ci.chromium_builder( + name = 'android-official', + # TODO(https://crbug.com/1072012) Use the default console view and add + # main_console_view = settings.main_console_name once the build is green + console_view = 'chromium.fyi', + console_view_entry = ci.console_view_entry( + category = 'android', + short_name = 'off', + ), + # TODO: Change this back down to something reasonable once these builders + # have populated their cached by getting through the compile step + execution_timeout = 6 * time.hour, +) + +ci.chromium_builder( + name = 'fuchsia-official', + # TODO(https://crbug.com/1072012) Use the default console view and add + # main_console_view = settings.main_console_name once the build is green + console_view = 'chromium.fyi', + console_view_entry = ci.console_view_entry( + category = 'fuchsia', + short_name = 'off', + ), + # TODO: Change this back down to something reasonable once these builders + # have populated their cached by getting through the compile step + execution_timeout = 6 * time.hour, +) + +ci.chromium_builder( + name = 'linux-official', + # TODO(https://crbug.com/1072012) Use the default console view and add + # main_console_view = settings.main_console_name once the build is green + console_view = 'chromium.fyi', + console_view_entry = ci.console_view_entry( + category = 'linux', + short_name = 'off', + ), + # TODO: Change this back down to something reasonable once these builders + # have populated their cached by getting through the compile step + execution_timeout = 6 * time.hour, +) ci.chromiumos_builder( name = 'chromeos-amd64-generic-dbg', @@ -442,6 +515,7 @@ ci.chromiumos_builder( category = 'simple|debug|x64', short_name = 'dbg', ), + main_console_view = settings.main_console_name, ) ci.chromiumos_builder( @@ -450,6 +524,7 @@ ci.chromiumos_builder( category = 'simple|release|x64', short_name = 'rel', ), + main_console_view = settings.main_console_name, ) ci.chromiumos_builder( @@ -458,21 +533,7 @@ ci.chromiumos_builder( category = 'simple|release', short_name = 'arm', ), -) - -ci.chromiumos_builder( - name = 'chromeos-kevin-rel', - console_view_entry = ci.console_view_entry( - category = 'simple|release', - short_name = 'kvn', - ), -) - -ci.fyi_builder( - name = 'chromeos-kevin-rel-hw-tests', - console_view_entry = ci.console_view_entry( - category = 'chromeos', - ), + main_console_view = settings.main_console_name, ) ci.chromiumos_builder( @@ -481,6 +542,7 @@ ci.chromiumos_builder( category = 'default', short_name = 'dbg', ), + main_console_view = settings.main_console_name, ) ci.chromiumos_builder( @@ -489,6 +551,7 @@ ci.chromiumos_builder( category = 'default', short_name = 'rel', ), + main_console_view = settings.main_console_name, ) @@ -498,6 +561,7 @@ ci.dawn_builder( category = 'DEPS|Linux|Builder', short_name = 'x64', ), + main_console_view = None, ) ci.dawn_builder( @@ -507,6 +571,7 @@ ci.dawn_builder( short_name = 'x64', ), cores = 2, + main_console_view = None, os = os.LINUX_DEFAULT, triggered_by = [builder_name('Dawn Linux x64 DEPS Builder')], ) @@ -518,6 +583,7 @@ ci.dawn_builder( short_name = 'x64', ), cores = 2, + main_console_view = None, os = os.LINUX_DEFAULT, triggered_by = [builder_name('Dawn Linux x64 DEPS Builder')], ) @@ -530,6 +596,7 @@ ci.dawn_builder( short_name = 'x64', ), cores = None, + main_console_view = None, os = os.MAC_ANY, ) @@ -542,6 +609,7 @@ ci.dawn_builder( short_name = 'x64', ), cores = 2, + main_console_view = None, os = os.LINUX_DEFAULT, triggered_by = [builder_name('Dawn Mac x64 DEPS Builder')], ) @@ -553,6 +621,7 @@ ci.dawn_builder( short_name = 'x64', ), cores = 2, + main_console_view = None, os = os.LINUX_DEFAULT, triggered_by = [builder_name('Dawn Mac x64 DEPS Builder')], ) @@ -563,6 +632,7 @@ ci.dawn_builder( category = 'DEPS|Windows|Builder', short_name = 'x64', ), + main_console_view = None, os = os.WINDOWS_ANY, ) @@ -573,6 +643,7 @@ ci.dawn_builder( short_name = 'x64', ), cores = 2, + main_console_view = None, os = os.LINUX_DEFAULT, triggered_by = [builder_name('Dawn Win10 x64 DEPS Builder')], ) @@ -584,6 +655,7 @@ ci.dawn_builder( short_name = 'x64', ), cores = 2, + main_console_view = None, os = os.LINUX_DEFAULT, triggered_by = [builder_name('Dawn Win10 x64 DEPS Builder')], ) @@ -594,6 +666,7 @@ ci.dawn_builder( category = 'DEPS|Windows|Builder', short_name = 'x86', ), + main_console_view = None, os = os.WINDOWS_ANY, ) @@ -604,6 +677,7 @@ ci.dawn_builder( short_name = 'x86', ), cores = 2, + main_console_view = None, os = os.LINUX_DEFAULT, triggered_by = [builder_name('Dawn Win10 x86 DEPS Builder')], ) @@ -615,6 +689,7 @@ ci.dawn_builder( short_name = 'x86', ), cores = 2, + main_console_view = None, os = os.LINUX_DEFAULT, triggered_by = [builder_name('Dawn Win10 x86 DEPS Builder')], ) @@ -625,6 +700,7 @@ ci.fyi_builder( console_view_entry = ci.console_view_entry( category = 'linux', ), + main_console_view = None, ) # This is launching & collecting entirely isolated tests. @@ -636,9 +712,20 @@ ci.fyi_builder( short_name = 'beta', ), goma_backend = None, + main_console_view = None, triggered_by = [builder_name('Mac Builder')], ) +ci.fyi_builder( + name = 'mac-arm64', + console_view_entry = ci.console_view_entry( + category = 'mac', + short_name = 'arm64', + ), + main_console_view = None, + cores = None, + os = os.MAC_ANY, +) ci.fyi_ios_builder( name = 'ios-simulator-cronet', @@ -646,9 +733,10 @@ ci.fyi_ios_builder( category = 'cronet', ), executable = 'recipe:chromium', + main_console_view = None, notifies = ['cronet'], properties = { - 'xcode_build_version': '11c29', + 'xcode_build_version': '11e146', }, ) @@ -659,6 +747,7 @@ ci.fyi_windows_builder( category = 'win10|1803', ), goma_backend = None, + main_console_view = None, os = os.WINDOWS_10, triggered_by = [builder_name('Win x64 Builder')], ) @@ -737,6 +826,7 @@ ci.linux_builder( short_name = 'vid', ), goma_jobs = goma.jobs.J50, + main_console_view = settings.main_console_name, ) ci.linux_builder( @@ -745,6 +835,7 @@ ci.linux_builder( category = 'fuchsia|a64', short_name = 'rel', ), + main_console_view = settings.main_console_name, notifies = ['cr-fuchsia'], ) @@ -754,6 +845,7 @@ ci.linux_builder( category = 'fuchsia|x64', short_name = 'rel', ), + main_console_view = settings.main_console_name, notifies = ['cr-fuchsia'], ) @@ -763,6 +855,7 @@ ci.linux_builder( category = 'release', short_name = 'bld', ), + main_console_view = settings.main_console_name, ) ci.linux_builder( @@ -771,6 +864,7 @@ ci.linux_builder( category = 'debug|builder', short_name = '64', ), + main_console_view = settings.main_console_name, ) ci.linux_builder( @@ -780,6 +874,7 @@ ci.linux_builder( short_name = 'tst', ), goma_backend = None, + main_console_view = settings.main_console_name, triggered_by = [builder_name('Linux Builder')], ) @@ -789,6 +884,7 @@ ci.linux_builder( category = 'debug|tester', short_name = '64', ), + main_console_view = settings.main_console_name, triggered_by = [builder_name('Linux Builder (dbg)')], ) @@ -798,6 +894,7 @@ ci.linux_builder( category = 'fuchsia|cast', short_name = 'a64', ), + main_console_view = settings.main_console_name, notifies = ['cr-fuchsia'], ) @@ -807,6 +904,7 @@ ci.linux_builder( category = 'fuchsia|cast', short_name = 'x64', ), + main_console_view = settings.main_console_name, notifies = ['cr-fuchsia'], ) @@ -816,6 +914,7 @@ ci.linux_builder( category = 'release', short_name = 'ozo', ), + main_console_view = settings.main_console_name, ) ci.linux_builder( @@ -825,6 +924,7 @@ ci.linux_builder( category = 'linux', short_name = 'loh', ), + main_console_view = None, triggered_by = [builder_name('linux-ozone-rel')], ) @@ -835,6 +935,7 @@ ci.linux_builder( category = 'linux', short_name = 'low', ), + main_console_view = None, triggered_by = [builder_name('linux-ozone-rel')], ) @@ -845,6 +946,7 @@ ci.linux_builder( category = 'linux', short_name = 'lox', ), + main_console_view = None, triggered_by = [builder_name('linux-ozone-rel')], ) @@ -855,6 +957,7 @@ ci.mac_builder( category = 'release', short_name = 'bld', ), + main_console_view = settings.main_console_name, os = os.MAC_10_14, ) @@ -864,6 +967,7 @@ ci.mac_builder( category = 'debug', short_name = 'bld', ), + main_console_view = settings.main_console_name, os = os.MAC_ANY, ) @@ -874,6 +978,7 @@ ci.thin_tester( category = 'release', short_name = '10', ), + main_console_view = settings.main_console_name, triggered_by = [builder_name('Mac Builder')], ) @@ -884,6 +989,7 @@ ci.thin_tester( category = 'release', short_name = '11', ), + main_console_view = settings.main_console_name, triggered_by = [builder_name('Mac Builder')], ) @@ -894,6 +1000,7 @@ ci.thin_tester( category = 'release', short_name = '12', ), + main_console_view = settings.main_console_name, triggered_by = [builder_name('Mac Builder')], ) @@ -904,6 +1011,7 @@ ci.thin_tester( category = 'release', short_name = '13', ), + main_console_view = settings.main_console_name, triggered_by = [builder_name('Mac Builder')], ) @@ -914,6 +1022,7 @@ ci.thin_tester( category = 'release', short_name = '14', ), + main_console_view = settings.main_console_name, triggered_by = [builder_name('Mac Builder')], ) @@ -924,6 +1033,7 @@ ci.thin_tester( category = 'debug', short_name = '13', ), + main_console_view = settings.main_console_name, triggered_by = [builder_name('Mac Builder (dbg)')], ) @@ -934,6 +1044,7 @@ ci.thin_tester( category = 'release', short_name = 'ret', ), + main_console_view = settings.main_console_name, triggered_by = [builder_name('Mac Builder')], ) @@ -944,10 +1055,7 @@ ci.mac_ios_builder( category = 'ios|default', short_name = 'sim', ), - executable = 'recipe:chromium', - properties = { - 'xcode_build_version': '11c29', - }, + main_console_view = settings.main_console_name, ) ci.mac_ios_builder( @@ -956,7 +1064,7 @@ ci.mac_ios_builder( category = 'ios|default', short_name = 'ful', ), - executable = 'recipe:chromium', + main_console_view = settings.main_console_name, ) @@ -966,6 +1074,7 @@ ci.memory_builder( category = 'linux|asan lsan', short_name = 'bld', ), + main_console_view = settings.main_console_name, ssd = True, ) @@ -975,6 +1084,7 @@ ci.memory_builder( category = 'linux|asan lsan', short_name = 'tst', ), + main_console_view = settings.main_console_name, triggered_by = [builder_name('Linux ASan LSan Builder')], ) @@ -984,6 +1094,7 @@ ci.memory_builder( category = 'linux|asan lsan', short_name = 'sbx', ), + main_console_view = settings.main_console_name, triggered_by = [builder_name('Linux ASan LSan Builder')], ) @@ -993,6 +1104,7 @@ ci.memory_builder( category = 'linux|TSan v2', short_name = 'bld', ), + main_console_view = settings.main_console_name, ) ci.memory_builder( @@ -1002,6 +1114,7 @@ ci.memory_builder( short_name = 'tst', ), triggered_by = [builder_name('Linux TSan Builder')], + main_console_view = settings.main_console_name, ) @@ -1012,6 +1125,7 @@ ci.win_builder( short_name = '7', ), os = os.WINDOWS_7, + main_console_view = settings.main_console_name, triggered_by = [builder_name('Win Builder (dbg)')], ) @@ -1022,6 +1136,7 @@ ci.win_builder( short_name = '64', ), os = os.WINDOWS_7, + main_console_view = settings.main_console_name, triggered_by = [builder_name('Win x64 Builder')], ) @@ -1032,6 +1147,7 @@ ci.win_builder( short_name = '32', ), cores = 32, + main_console_view = settings.main_console_name, os = os.WINDOWS_ANY, ) @@ -1042,6 +1158,7 @@ ci.win_builder( short_name = '64', ), cores = 32, + main_console_view = settings.main_console_name, os = os.WINDOWS_ANY, ) @@ -1051,5 +1168,6 @@ ci.win_builder( category = 'release|tester', short_name = 'w10', ), + main_console_view = settings.main_console_name, triggered_by = [builder_name('Win x64 Builder')], ) diff --git a/chromium/infra/config/subprojects/chromium/main.star b/chromium/infra/config/subprojects/chromium/main.star index 5643712bb57..58940e96e87 100644 --- a/chromium/infra/config/subprojects/chromium/main.star +++ b/chromium/infra/config/subprojects/chromium/main.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + load('//project.star', 'master_only_exec') exec('./ci.star') diff --git a/chromium/infra/config/subprojects/chromium/master-only/ci.star b/chromium/infra/config/subprojects/chromium/master-only/ci.star index 633e24c9180..9c233fa80db 100644 --- a/chromium/infra/config/subprojects/chromium/master-only/ci.star +++ b/chromium/infra/config/subprojects/chromium/master-only/ci.star @@ -1,11 +1,15 @@ +# Copyright 2020 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. + load('//lib/builders.star', 'cpu', 'goma', 'os', 'xcode_cache') load('//lib/ci.star', 'ci') load('//project.star', 'settings') # Execute the versioned files to define all of the per-branch entities # (bucket, builders, console, poller, etc.) -exec('../versioned/m81/buckets/ci.star') exec('../versioned/m83/buckets/ci.star') +exec('../versioned/m84/buckets/ci.star') ci.set_defaults( @@ -89,6 +93,10 @@ ci.builder( 'cipd_yaml': 'third_party/android_sdk/cipd/build-tools/29.0.2.yaml' }, { + 'sdk_package_name': 'cmdline-tools;latest', + 'cipd_yaml': 'third_party/android_sdk/cipd/cmdline-tools.yaml' + }, + { 'sdk_package_name': 'emulator', 'cipd_yaml': 'third_party/android_sdk/cipd/emulator.yaml' }, @@ -128,10 +136,11 @@ ci.builder( 'sdk_package_name': 'system-images;android-23;google_apis;x86', 'cipd_yaml': 'third_party/android_sdk/cipd/system_images/android-23/google_apis/x86.yaml' }, - { - 'sdk_package_name': 'system-images;android-28;google_apis;x86', - 'cipd_yaml': 'third_party/android_sdk/cipd/system_images/android-28/google_apis/x86.yaml' - }, + # Missing due to http://b/155847875. + #{ + # 'sdk_package_name': 'system-images;android-28;google_apis;x86', + # 'cipd_yaml': 'third_party/android_sdk/cipd/system_images/android-28/google_apis/x86.yaml' + #}, { 'sdk_package_name': 'system-images;android-28;google_apis_playstore;x86', 'cipd_yaml': 'third_party/android_sdk/cipd/system_images/android-28/google_apis_playstore/x86.yaml' @@ -166,7 +175,6 @@ ci.android_builder( category = 'tester|webview', short_name = 'L', ), - main_console_view = 'main', triggered_by = ['ci/Android arm Builder (dbg)'], ) @@ -199,7 +207,6 @@ ci.android_builder( # We have limited phone capacity and thus limited ability to run # tests in parallel, hence the high timeout. execution_timeout = 6 * time.hour, - main_console_view = 'main', triggered_by = ['ci/Android arm Builder (dbg)'], ) @@ -212,7 +219,6 @@ ci.android_builder( # We have limited tablet capacity and thus limited ability to run # tests in parallel, hence the high timeout. execution_timeout = 20 * time.hour, - main_console_view = 'main', triggered_by = ['ci/Android arm Builder (dbg)'], ) @@ -225,7 +231,6 @@ ci.android_builder( # We have limited tablet capacity and thus limited ability to run # tests in parallel, hence the high timeout. execution_timeout = 12 * time.hour, - main_console_view = 'main', triggered_by = ['ci/Android arm Builder (dbg)'], ) @@ -330,6 +335,15 @@ ci.android_builder( ), ) +ci.android_builder( + name = 'android-binary-size-generator', + executable = 'recipe:binary_size_generator_tot', + console_view_entry = ci.console_view_entry( + category = 'builder|other', + short_name = 'size', + ), +) + ci.android_fyi_builder( name = 'android-bfcache-rel', @@ -507,6 +521,7 @@ ci.chromiumos_builder( category = 'default', short_name = 'ful', ), + main_console_view = 'main', ) ci.chromiumos_builder( @@ -515,6 +530,7 @@ ci.chromiumos_builder( category = 'simple|release|x64', short_name = 'asn', ), + main_console_view = 'main', ) ci.chromiumos_builder( @@ -523,6 +539,7 @@ ci.chromiumos_builder( category = 'simple|release|x64', short_name = 'cfi', ), + main_console_view = 'main', ) ci.chromiumos_builder( @@ -531,6 +548,16 @@ ci.chromiumos_builder( category = 'simple|debug', short_name = 'arm', ), + main_console_view = 'main', +) + +ci.chromiumos_builder( + name = 'chromeos-kevin-rel', + console_view_entry = ci.console_view_entry( + category = 'simple|release', + short_name = 'kvn', + ), + main_console_view = 'main', ) @@ -625,77 +652,65 @@ ci.clang_builder( ), ) -ci.clang_builder( +def clang_tot_linux_builder(short_name, category='ToT Linux', **kwargs): + ci.clang_builder( + console_view_entry = ci.console_view_entry( + category = category, + short_name = short_name, + ), + notifies = [luci.notifier( + name = 'ToT Linux notifier', + on_new_status = ['FAILURE'], + notify_emails = ['thomasanderson@chromium.org'], + )], + **kwargs, + ) + +clang_tot_linux_builder( name = 'ToTLinux', - console_view_entry = ci.console_view_entry( - category = 'ToT Linux', - short_name = 'rel', - ), + short_name = 'rel', ) -ci.clang_builder( +clang_tot_linux_builder( name = 'ToTLinux (dbg)', - console_view_entry = ci.console_view_entry( - category = 'ToT Linux', - short_name = 'dbg', - ), + short_name = 'dbg', ) -ci.clang_builder( +clang_tot_linux_builder( name = 'ToTLinuxASan', - console_view_entry = ci.console_view_entry( - category = 'ToT Linux', - short_name = 'asn', - ), + short_name = 'asn', ) -ci.clang_builder( +clang_tot_linux_builder( name = 'ToTLinuxASanLibfuzzer', - console_view_entry = ci.console_view_entry( - category = 'ToT Linux', - short_name = 'fuz', - ), + short_name = 'fuz', ) -ci.clang_builder( +clang_tot_linux_builder( name = 'ToTLinuxCoverage', - console_view_entry = ci.console_view_entry( - category = 'ToT Code Coverage', - short_name = 'linux', - ), + category = 'ToT Code Coverage', + short_name = 'linux', executable = 'recipe:chromium_clang_coverage_tot', ) -ci.clang_builder( +clang_tot_linux_builder( name = 'ToTLinuxMSan', - console_view_entry = ci.console_view_entry( - category = 'ToT Linux', - short_name = 'msn', - ), + short_name = 'msn', ) -ci.clang_builder( +clang_tot_linux_builder( name = 'ToTLinuxTSan', - console_view_entry = ci.console_view_entry( - category = 'ToT Linux', - short_name = 'tsn', - ), + short_name = 'tsn', ) -ci.clang_builder( +clang_tot_linux_builder( name = 'ToTLinuxThinLTO', - console_view_entry = ci.console_view_entry( - category = 'ToT Linux', - short_name = 'lto', - ), + short_name = 'lto', ) -ci.clang_builder( +clang_tot_linux_builder( name = 'ToTLinuxUBSanVptr', - console_view_entry = ci.console_view_entry( - category = 'ToT Linux', - short_name = 'usn', - ), + short_name = 'usn', ) ci.clang_builder( @@ -969,6 +984,14 @@ ci.dawn_builder( triggered_by = ['Dawn Win10 x64 Builder'], ) +ci.dawn_builder( + name = 'Dawn Win10 x64 ASAN Release', + console_view_entry = ci.console_view_entry( + category = 'ToT|Windows|ASAN', + short_name = 'x64', + ), + os = os.WINDOWS_ANY, +) ci.fuzz_builder( name = 'ASAN Debug', @@ -1428,13 +1451,6 @@ ci.fyi_builder( ) ci.fyi_builder( - name = 'chromeos-amd64-generic-rel-vm-tests', - console_view_entry = ci.console_view_entry( - category = 'chromeos', - ), -) - -ci.fyi_builder( name = 'fuchsia-fyi-arm64-rel', console_view_entry = ci.console_view_entry( category = 'fuchsia|a64', @@ -1485,13 +1501,6 @@ ci.fyi_builder( ) ci.fyi_builder( - name = 'linux-blink-cors-rel', - console_view_entry = ci.console_view_entry( - category = 'linux', - ), -) - -ci.fyi_builder( name = 'linux-blink-heap-concurrent-marking-tsan-rel', console_view_entry = ci.console_view_entry( category = 'linux|blink', @@ -1637,18 +1646,18 @@ ci.fyi_coverage_builder( ci.fyi_coverage_builder( name = 'ios-simulator-code-coverage', - caches = [xcode_cache.x11c29], + caches = [xcode_cache.x11e146], console_view_entry = ci.console_view_entry( category = 'code_coverage', short_name = 'ios', ), cores = None, - os = os.MAC_ANY, + os = os.MAC_10_15, use_clang_coverage = True, + coverage_exclude_sources = 'ios_test_files_and_test_utils', + coverage_test_types = ['overall', 'unit'], properties = { - 'coverage_exclude_sources': 'ios_test_files_and_test_utils', - 'coverage_test_types': ['overall', 'unit'], - 'xcode_build_version': '11c29', + 'xcode_build_version': '11e146', }, ) @@ -1698,6 +1707,19 @@ ci.fyi_coverage_builder( ci.fyi_ios_builder( + name = 'ios-asan', + console_view_entry = ci.console_view_entry( + category = 'iOS', + short_name = 'asan', + ), + executable = 'recipe:chromium', + os = os.MAC_10_15, + properties = { + 'xcode_build_version': '11e146', + }, +) + +ci.fyi_ios_builder( name = 'ios-simulator-cr-recipe', console_view_entry = ci.console_view_entry( category = 'iOS', @@ -1716,21 +1738,22 @@ ci.fyi_ios_builder( short_name = 'mwd', ), executable = 'recipe:chromium', + os = os.MAC_10_15, properties = { - 'xcode_build_version': '11c29', + 'xcode_build_version': '11e146', }, ) ci.fyi_ios_builder( name = 'ios-webkit-tot', - caches = [xcode_cache.x11n605cwk], + caches = [xcode_cache.x11e608cwk], console_view_entry = ci.console_view_entry( category = 'iOS', short_name = 'wk', ), executable = 'recipe:chromium', properties = { - 'xcode_build_version': '11n605cwk' + 'xcode_build_version': '11e608cwk' }, schedule = '0 1-23/6 * * *', triggered_by = [], @@ -1743,9 +1766,12 @@ ci.fyi_ios_builder( short_name = 'ios13', ), executable = 'recipe:chromium', + os = os.MAC_10_15, properties = { - 'xcode_build_version': '11c29', + 'xcode_build_version': '11e146', }, + schedule = '0 0,12 * * *', + triggered_by = [], ) ci.fyi_ios_builder( @@ -1754,9 +1780,11 @@ ci.fyi_ios_builder( category = 'iOS|iOS13', short_name = 'dev', ), + caches = [xcode_cache.x11n700h], executable = 'recipe:chromium', + os = os.MAC_10_15, properties = { - 'xcode_build_version': '11c29', + 'xcode_build_version': '11n700h', }, ) @@ -1764,13 +1792,42 @@ ci.fyi_ios_builder( name = 'ios13-sdk-simulator', console_view_entry = ci.console_view_entry( category = 'iOS|iOS13', - short_name = 'sim', + short_name = 'sdk13', ), - caches = [xcode_cache.x11e146], + caches = [xcode_cache.x11n700h], executable = 'recipe:chromium', os = os.MAC_10_15, properties = { - 'xcode_build_version': '11e146' + 'xcode_build_version': '11n700h' + }, + schedule = '0 6,18 * * *', + triggered_by = [], +) + +ci.fyi_ios_builder( + name = 'ios14-beta-simulator', + console_view_entry = ci.console_view_entry( + category = 'iOS|iOS14', + short_name = 'ios14', + ), + executable = 'recipe:chromium', + os = os.MAC_10_15, + properties = { + 'xcode_build_version': '11e146', + }, +) + +ci.fyi_ios_builder( + name = 'ios14-sdk-simulator', + console_view_entry = ci.console_view_entry( + category = 'iOS|iOS14', + short_name = 'sdk14', + ), + caches = [xcode_cache.x12a6159], + executable = 'recipe:chromium', + os = os.MAC_10_15, + properties = { + 'xcode_build_version': '12a6159' } ) @@ -2665,6 +2722,7 @@ ci.linux_builder( category = 'cast', short_name = 'aud', ), + main_console_view = 'main', ssd = True, ) @@ -2677,6 +2735,7 @@ ci.linux_builder( executable = 'recipe:swarming/deterministic_build', execution_timeout = 6 * time.hour, goma_jobs = None, + main_console_view = 'main', ) ci.linux_builder( @@ -2687,6 +2746,7 @@ ci.linux_builder( ), executable = 'recipe:swarming/deterministic_build', execution_timeout = 6 * time.hour, + main_console_view = 'main', ) ci.linux_builder( @@ -2698,6 +2758,7 @@ ci.linux_builder( cores = 32, executable = 'recipe:swarming/deterministic_build', execution_timeout = 6 * time.hour, + main_console_view = 'main', ) ci.linux_builder( @@ -2715,6 +2776,7 @@ ci.linux_builder( category = 'debug|builder', short_name = '32', ), + main_console_view = 'main', ) ci.linux_builder( @@ -2723,6 +2785,7 @@ ci.linux_builder( category = 'release', short_name = 'nsl', ), + main_console_view = 'main', ) ci.linux_builder( @@ -2731,16 +2794,28 @@ ci.linux_builder( category = 'fuchsia|x64', short_name = 'dbg', ), + main_console_view = 'main', notifies = ['cr-fuchsia'], ) ci.linux_builder( + name = 'linux-blink-cors-rel', + console_view_entry = ci.console_view_entry( + category = 'release', + short_name = 'crs', + ), + goma_jobs = None, + main_console_view = 'main', +) + +ci.linux_builder( name = 'linux-gcc-rel', console_view_entry = ci.console_view_entry( category = 'release', short_name = 'gcc', ), goma_backend = None, + main_console_view = 'main', ) ci.linux_builder( @@ -2749,6 +2824,7 @@ ci.linux_builder( category = 'release', short_name = 'tru', ), + main_console_view = 'main', os = os.LINUX_TRUSTY, ) @@ -2758,6 +2834,7 @@ ci.linux_builder( schedule = '0 0,6,12,18 * * *', service_account = 'component-mapping-updater@chops-service-accounts.iam.gserviceaccount.com', triggered_by = [], + notifies = ['component-mapping'], ) @@ -2767,7 +2844,6 @@ ci.mac_ios_builder( category = 'ios|default', short_name = 'dev', ), - executable = 'recipe:chromium', # We don't have necessary capacity to run this configuration in CQ, but it # is part of the main waterfall main_console_view = 'main', @@ -2810,6 +2886,7 @@ ci.memory_builder( # TODO(thakis): Remove once https://crbug.com/927738 is resolved. execution_timeout = 4 * time.hour, goma_jobs = goma.jobs.MANY_JOBS_FOR_CI, + main_console_view = 'main', ) ci.memory_builder( @@ -2821,6 +2898,7 @@ ci.memory_builder( # TODO(crbug.com/1030593): Builds take more than 3 hours sometimes. Remove # once the builds are faster. execution_timeout = 6 * time.hour, + main_console_view = 'main', ) ci.memory_builder( @@ -2830,6 +2908,7 @@ ci.memory_builder( short_name = 'tst', ), triggered_by = ['Linux Chromium OS ASan LSan Builder'], + main_console_view = 'main', ) ci.memory_builder( @@ -2838,6 +2917,7 @@ ci.memory_builder( category = 'cros|msan', short_name = 'bld', ), + main_console_view = 'main', ) ci.memory_builder( @@ -2847,6 +2927,7 @@ ci.memory_builder( short_name = 'tst', ), triggered_by = ['Linux ChromiumOS MSan Builder'], + main_console_view = 'main', ) ci.memory_builder( @@ -2856,6 +2937,7 @@ ci.memory_builder( short_name = 'bld', ), goma_jobs = goma.jobs.MANY_JOBS_FOR_CI, + main_console_view = 'main', ) ci.memory_builder( @@ -2865,6 +2947,7 @@ ci.memory_builder( short_name = 'tst', ), triggered_by = ['Linux MSan Builder'], + main_console_view = 'main', ) ci.memory_builder( @@ -2877,6 +2960,7 @@ ci.memory_builder( goma_debug = True, # TODO(hinoka): Remove this after debugging. goma_jobs = None, cores = None, # Swapping between 8 and 24 + main_console_view = 'main', os = os.MAC_DEFAULT, triggering_policy = scheduler.greedy_batching( max_concurrent_invocations = 2, @@ -2890,6 +2974,7 @@ ci.memory_builder( category = 'mac', short_name = 'tst', ), + main_console_view = 'main', os = os.MAC_DEFAULT, triggered_by = ['Mac ASan 64 Builder'], ) @@ -2900,6 +2985,7 @@ ci.memory_builder( category = 'linux|webkit', short_name = 'asn', ), + main_console_view = 'main', ) ci.memory_builder( @@ -2908,6 +2994,7 @@ ci.memory_builder( category = 'linux|webkit', short_name = 'lk', ), + main_console_view = 'main', ) ci.memory_builder( @@ -2916,6 +3003,7 @@ ci.memory_builder( category = 'linux|webkit', short_name = 'msn', ), + main_console_view = 'main', ) ci.memory_builder( @@ -2924,6 +3012,7 @@ ci.memory_builder( category = 'android', short_name = 'asn', ), + main_console_view = 'main', ) ci.memory_builder( @@ -2934,6 +3023,7 @@ ci.memory_builder( ), cores = 32, builderless = True, + main_console_view = 'main', os = os.WINDOWS_DEFAULT, ) @@ -3067,6 +3157,7 @@ ci.win_builder( category = 'misc', short_name = 'wbk', ), + main_console_view = 'main', triggered_by = ['Win Builder'], ) @@ -3077,6 +3168,7 @@ ci.win_builder( short_name = '32', ), cores = 32, + main_console_view = 'main', os = os.WINDOWS_ANY, ) @@ -3088,6 +3180,7 @@ ci.win_builder( ), cores = 32, builderless = True, + main_console_view = 'main', os = os.WINDOWS_ANY, ) @@ -3097,6 +3190,7 @@ ci.win_builder( category = 'debug|tester', short_name = '10', ), + main_console_view = 'main', triggered_by = ['Win x64 Builder (dbg)'], ) @@ -3106,6 +3200,7 @@ ci.win_builder( category = 'release|tester', short_name = '32', ), + main_console_view = 'main', os = os.WINDOWS_7, triggered_by = ['Win Builder'], ) @@ -3116,6 +3211,7 @@ ci.win_builder( category = 'release|tester', short_name = '32', ), + main_console_view = 'main', os = os.WINDOWS_7, triggered_by = ['Win Builder'], ) @@ -3128,4 +3224,6 @@ ci.win_builder( ), executable = 'recipe:swarming/deterministic_build', execution_timeout = 6 * time.hour, + goma_jobs = goma.jobs.J150, + main_console_view = 'main', ) diff --git a/chromium/infra/config/subprojects/chromium/master-only/consoles/android.packager.star b/chromium/infra/config/subprojects/chromium/master-only/consoles/android.packager.star index e00ffad39fe..6e705adc0b3 100644 --- a/chromium/infra/config/subprojects/chromium/master-only/consoles/android.packager.star +++ b/chromium/infra/config/subprojects/chromium/master-only/consoles/android.packager.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + luci.console_view( name = 'android.packager', header = '//chromium-header.textpb', diff --git a/chromium/infra/config/subprojects/chromium/master-only/consoles/luci.chromium.try.star b/chromium/infra/config/subprojects/chromium/master-only/consoles/luci.chromium.try.star index 48639b13748..cdf6632a742 100644 --- a/chromium/infra/config/subprojects/chromium/master-only/consoles/luci.chromium.try.star +++ b/chromium/infra/config/subprojects/chromium/master-only/consoles/luci.chromium.try.star @@ -1,9 +1,15 @@ +# Copyright 2020 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. + luci.list_view( name = 'luci.chromium.try', entries = [ 'try/android-cronet-arm-dbg', 'try/android-lollipop-arm-rel', 'try/android-marshmallow-arm64-rel', + 'try/android-marshmallow-x86-rel', + 'try/android-nougat-arm64-rel', 'try/android-oreo-arm64-cts-networkservice-dbg', 'try/android-pie-arm64-coverage-rel', 'try/android-pie-arm64-rel', @@ -137,6 +143,7 @@ luci.list_view( 'try/linux_upload_clang', 'try/linux-viz-rel', 'try/linux-wpt-fyi-rel', + 'try/network_service_linux', 'try/ios-device', 'try/ios-simulator', 'try/ios-simulator-cronet', @@ -164,7 +171,6 @@ luci.list_view( 'try/win7-rel', 'try/win10_chromium_x64_dbg_ng', 'try/win10_chromium_x64_rel_ng', - 'try/win10_chromium_x64_coverage_rel_ng', 'try/win10_chromium_x64_rel_ng_exp', 'try/win-angle-deqp-rel-32', 'try/win-angle-deqp-rel-64', diff --git a/chromium/infra/config/subprojects/chromium/master-only/consoles/sheriff.ios.star b/chromium/infra/config/subprojects/chromium/master-only/consoles/sheriff.ios.star index 8b88b2849b9..ea84441959e 100644 --- a/chromium/infra/config/subprojects/chromium/master-only/consoles/sheriff.ios.star +++ b/chromium/infra/config/subprojects/chromium/master-only/consoles/sheriff.ios.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + luci.console_view( name = 'sheriff.ios', header = '//chromium-header.textpb', diff --git a/chromium/infra/config/subprojects/chromium/master-only/fallback-cq.star b/chromium/infra/config/subprojects/chromium/master-only/fallback-cq.star index c6f6e2338aa..b795ea30233 100644 --- a/chromium/infra/config/subprojects/chromium/master-only/fallback-cq.star +++ b/chromium/infra/config/subprojects/chromium/master-only/fallback-cq.star @@ -1,4 +1,147 @@ -# TODO(gbeaty) Update the watch to not include active branch heads +# Copyright 2020 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. + +load('//project.star', 'ACTIVE_BRANCH_NUMBERS') + + +def _trailing_digit_regex(n): + if n == 0: + return '' + if n == 1: + return r'\d' + return r'\d{%d}' % n + + +def _numbers_of_lengths(l, u): + if l > u: + return [] + + if l == u: + if l == 1: + return [] + if l == 2: + return [r'[1-9]\d'] + return [r'[1-9]\d{%s}' % (l - 1)] + + return [r'[1-9]\d{%s,%s}' % (l - 1, u - 1)] + + +def _char_to_digit(c): + d = ord(c) - ord('0') + if d < 0 or d > 9: + fail('Unxpected character: {}'.format(c)) + return d + + +def _digit_range(l, u): + if l == u: + return str(l) + if l < u: + return '[{}-{}]'.format(l, u) + return None + + +def _to_next_position(x, prefix=''): + """Create regexes that match the range (x, 10^len(x)). + + Args: + x - The non-inclusive lower bound. + prefix - A prefix to add to each regex. + + Returns: + A list of strings that that match the specified range. The returned regexes + are in order of the ranges of numbers that would be matched. + """ + regexes = [] + for i, c in enumerate(x.elems(), 1): + position_str = _digit_range(_char_to_digit(c) + 1, 9) + if position_str != None: + regexes.append('{prefix}{position}{suffix}'.format( + prefix=prefix, + position=position_str, + suffix=_trailing_digit_regex(len(x) - i))) + prefix += c + return reversed(regexes) + + +def _from_current_position(x, prefix=''): + """Create regexes that match the range [10^(len(x)-1), x). + + Args: + x - The non-inclusive upper bound. + prefix - A prefix to add to each regex. + + Returns: + A list of strings that that match the specified range. The returned regexes + are in order of the ranges of numbers that would be matched. + """ + regexes = [] + for i, c in enumerate(x.elems(), 1): + min_leading = 0 if prefix else 1 + position_str = _digit_range(min_leading, _char_to_digit(c) - 1) + if position_str != None: + regexes.append('{prefix}{position}{suffix}'.format( + prefix=prefix, + position=position_str, + suffix=_trailing_digit_regex(len(x) - i))) + prefix += c + return regexes + + +def _get_fallback_branch_number_regexes(): + # Check that they're int first since we're relying on numeric qualities to + # create the regexes + branch_strs = [] + for b in sorted(ACTIVE_BRANCH_NUMBERS): + if type(b) != type(0): + fail('The elements of ACTIVE_BRANCH_NUMBERS are expected to be ints,' + + ' got {} ({})'.format(type(b), b)) + branch_strs.append(str(b)) + + regexes = [] + + # Lower than the lowest active branch number + regexes.extend(_numbers_of_lengths(1, len(branch_strs[0]) - 1)) + regexes.extend(_from_current_position(branch_strs[0])) + + # In between successive active branches + for lower, upper in zip(branch_strs, branch_strs[1:]): + if len(lower) < len(upper): + regexes.extend(_to_next_position(lower)) + regexes.extend(_numbers_of_lengths(len(lower) + 1, len(upper) - 1)) + regexes.extend(_from_current_position(upper)) + break + + prefix = '' + for i in range(len(lower)): + if lower[i] != upper[i]: + break + prefix += lower[i] + + regexes.extend(_to_next_position(lower[i + 1:], prefix=prefix + lower[i])) + + # Get regexes for the digits between the first two different digits + # e.g. regexes for 430 to 450 when comparing 425 and 461 + lower_bound = _char_to_digit(lower[i]) + 1 + upper_bound = _char_to_digit(upper[i]) - 1 + position_str = _digit_range(lower_bound, upper_bound) + if position_str != None: + regexes.append('{prefix}{position}{suffix}'.format( + prefix=prefix, + position=position_str, + suffix=_trailing_digit_regex(len(lower) - i - 1))) + + regexes.extend(_from_current_position(upper[i + 1:], prefix=prefix + upper[i])) + + # Greater than the greatest active branch number + regexes.extend(_to_next_position(branch_strs[-1])) + # Catch all numbers with more digits than the highest active branch + regexes.append(r'[1-9]\d{%d,}' % len(branch_strs[-1])) + + return regexes + + # Declare a CQ group that watches all branch heads # We won't add any builders, but SUBMIT TO CQ fails on Gerrit if there is no CQ # group @@ -7,7 +150,11 @@ luci.cq_group( retry_config = cq.RETRY_ALL_FAILURES, watch = cq.refset( repo = 'https://chromium.googlesource.com/chromium/src', - refs = ['refs/branch-heads/.+'], + refs = ( + # \D - non-digit, match any branch that is not entirely numeric + [r'refs/branch-heads/.*\D.*'] + + ['refs/branch-heads/' + regex + for regex in _get_fallback_branch_number_regexes()]), ), acls = [ acl.entry( diff --git a/chromium/infra/config/subprojects/chromium/master-only/gpu.try.star b/chromium/infra/config/subprojects/chromium/master-only/gpu.try.star index fb3e8cfb40f..9761010018b 100644 --- a/chromium/infra/config/subprojects/chromium/master-only/gpu.try.star +++ b/chromium/infra/config/subprojects/chromium/master-only/gpu.try.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + load('//lib/builders.star', 'builder', 'cpu', 'defaults', 'goma', 'os') load('//lib/try.star', 'try_') load('//project.star', 'settings') diff --git a/chromium/infra/config/subprojects/chromium/master-only/main.star b/chromium/infra/config/subprojects/chromium/master-only/main.star index 893def7293d..a45a4d3c460 100644 --- a/chromium/infra/config/subprojects/chromium/master-only/main.star +++ b/chromium/infra/config/subprojects/chromium/master-only/main.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + exec('./ci.star') exec('./gpu.try.star') exec('./swangle.try.star') diff --git a/chromium/infra/config/subprojects/chromium/master-only/swangle.try.star b/chromium/infra/config/subprojects/chromium/master-only/swangle.try.star index 655939b081f..f00185d6319 100644 --- a/chromium/infra/config/subprojects/chromium/master-only/swangle.try.star +++ b/chromium/infra/config/subprojects/chromium/master-only/swangle.try.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + load('//lib/builders.star', 'builder', 'cpu', 'defaults', 'goma', 'os') load('//lib/try.star', 'try_') load('//project.star', 'settings') diff --git a/chromium/infra/config/subprojects/chromium/master-only/try.star b/chromium/infra/config/subprojects/chromium/master-only/try.star index 80aa92e36a2..665f5f2c395 100644 --- a/chromium/infra/config/subprojects/chromium/master-only/try.star +++ b/chromium/infra/config/subprojects/chromium/master-only/try.star @@ -1,11 +1,15 @@ +# Copyright 2020 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. + load('//lib/builders.star', 'cpu', 'goma', 'os', 'xcode_cache') load('//lib/try.star', 'try_') load('//project.star', 'settings') # Execute the versioned files to define all of the per-branch entities # (bucket, builders, console, cq_group, etc.) -exec('../versioned/m81/buckets/try.star') exec('../versioned/m83/buckets/try.star') +exec('../versioned/m84/buckets/try.star') try_.set_defaults( @@ -20,6 +24,10 @@ try_.set_defaults( # Builders are sorted first lexicographically by the function used to define # them, then lexicographically by their name +try_.blink_builder( + name = 'linux-blink-optional-highdpi-rel', + goma_backend = goma.backend.RBE_PROD, +) try_.blink_builder( name = 'win10-blink-rel', @@ -170,13 +178,6 @@ try_.chromium_android_builder( ) try_.chromium_android_builder( - name = 'android_cronet_tester', - properties = { - 'buildername': 'android-cronet-arm-dbg', - }, -) - -try_.chromium_android_builder( name = 'android_mojo', ) @@ -273,6 +274,27 @@ try_.chromium_chromiumos_builder( ) try_.chromium_chromiumos_builder( + name = 'chromeos-kevin-compile-rel', + tryjob = try_.job( + location_regexp = [ + '.+/[+]/chromeos/CHROMEOS_LKGM', + ], + ), + main_list_view = 'try' +) + +try_.chromium_chromiumos_builder( + name = 'chromeos-kevin-rel', + tryjob = try_.job( + location_regexp = [ + '.+/[+]/build/chromeos/.+', + '.+/[+]/build/config/chromeos/.*', + ], + ), + main_list_view = 'try', +) + +try_.chromium_chromiumos_builder( name = 'linux-chromeos-dbg', ) @@ -291,6 +313,16 @@ try_.chromium_dawn_builder( os = os.WINDOWS_ANY, ) +try_.chromium_dawn_builder( + name = 'dawn-try-win10-x86-rel', + os = os.WINDOWS_ANY, +) + +try_.chromium_dawn_builder( + name = 'dawn-try-win10-x64-asan-rel', + os = os.WINDOWS_ANY, +) + try_.chromium_linux_builder( name = 'cast_shell_audio_linux', @@ -472,6 +504,10 @@ try_.chromium_linux_builder( ) try_.chromium_linux_builder( + name = 'network_service_linux', +) + +try_.chromium_linux_builder( name = 'tricium-metrics-analysis', executable = 'recipe:tricium_metrics', ) @@ -558,11 +594,13 @@ try_.chromium_mac_ios_builder( name = 'ios-simulator-code-coverage', executable = 'recipe:chromium_trybot', use_clang_coverage = True, + coverage_exclude_sources = 'ios_test_files_and_test_utils', + coverage_test_types = ['unit'], + os = os.MAC_10_15, properties = { - 'coverage_exclude_sources': 'ios_test_files_and_test_utils', - 'coverage_test_types': ['unit'], - 'xcode_build_version': '11c29', + 'xcode_build_version': '11e146', }, + tryjob = try_.job(experiment_percentage = 3) ) try_.chromium_mac_ios_builder( @@ -586,11 +624,26 @@ try_.chromium_mac_ios_builder( try_.chromium_mac_ios_builder( name = 'ios13-beta-simulator', executable = 'recipe:chromium_trybot', + caches = [xcode_cache.x11e608c], + os = os.MAC_10_15, + properties = { + 'xcode_build_version': '11e608c' + } ) try_.chromium_mac_ios_builder( name = 'ios13-sdk-simulator', executable = 'recipe:chromium_trybot', + caches = [xcode_cache.x11n700h], + os = os.MAC_10_15, + properties = { + 'xcode_build_version': '11n700h' + } +) + +try_.chromium_mac_ios_builder( + name = 'ios14-beta-simulator', + executable = 'recipe:chromium_trybot', caches = [xcode_cache.x11e146], os = os.MAC_10_15, properties = { @@ -598,6 +651,16 @@ try_.chromium_mac_ios_builder( } ) +try_.chromium_mac_ios_builder( + name = 'ios14-sdk-simulator', + executable = 'recipe:chromium_trybot', + caches = [xcode_cache.x11n700h], + os = os.MAC_10_15, + properties = { + 'xcode_build_version': '11n700h' + } +) + try_.chromium_win_builder( name = 'win-annotator-rel', ) @@ -619,15 +682,6 @@ try_.chromium_win_builder( ) try_.chromium_win_builder( - name = 'win10_chromium_x64_coverage_rel_ng', - os = os.WINDOWS_10, - use_clang_coverage = True, - goma_jobs = goma.jobs.J150, - ssd = True, - tryjob = try_.job(experiment_percentage = 3), -) - -try_.chromium_win_builder( name = 'win10_chromium_x64_dbg_ng', os = os.WINDOWS_10, ) @@ -704,35 +758,35 @@ chrome_internal_verifier( ) chrome_internal_verifier( - builder = 'chromeos-eve-compile-chrome', + builder = 'chromeos-eve-chrome', ) chrome_internal_verifier( - builder = 'chromeos-kevin-compile-chrome', + builder = 'chromeos-eve-compile-chrome', ) chrome_internal_verifier( - builder = 'ipad-device', + builder = 'chromeos-kevin-chrome', ) chrome_internal_verifier( - builder = 'iphone-device', + builder = 'chromeos-kevin-compile-chrome', ) chrome_internal_verifier( - builder = 'linux-chromeos-chrome', + builder = 'ipad-device', ) chrome_internal_verifier( - builder = 'mac-chrome', + builder = 'iphone-device', ) chrome_internal_verifier( - builder = 'mac-chrome-beta', + builder = 'linux-chromeos-chrome', ) chrome_internal_verifier( - builder = 'mac-chrome-stable', + builder = 'mac-chrome', ) chrome_internal_verifier( @@ -740,21 +794,5 @@ chrome_internal_verifier( ) chrome_internal_verifier( - builder = 'win-chrome-beta', -) - -chrome_internal_verifier( - builder = 'win-chrome-stable', -) - -chrome_internal_verifier( builder = 'win64-chrome', ) - -chrome_internal_verifier( - builder = 'win64-chrome-beta', -) - -chrome_internal_verifier( - builder = 'win64-chrome-stable', -) diff --git a/chromium/infra/config/subprojects/chromium/try.star b/chromium/infra/config/subprojects/chromium/try.star index 07706f4e3d3..778e94466e3 100644 --- a/chromium/infra/config/subprojects/chromium/try.star +++ b/chromium/infra/config/subprojects/chromium/try.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + load('//lib/builders.star', 'cpu', 'goma', 'os') load('//lib/try.star', 'try_') load('//project.star', 'settings') @@ -18,6 +22,7 @@ try_.set_defaults( name = name, ) for name in ( 'tryserver.blink', + 'tryserver.chromium', 'tryserver.chromium.android', 'tryserver.chromium.angle', 'tryserver.chromium.chromiumos', @@ -46,6 +51,17 @@ try_.blink_builder( ), ) +try_.chromium_builder( + name = 'android-official', +) + +try_.chromium_builder( + name = 'fuchsia-official', +) + +try_.chromium_builder( + name = 'linux-official', +) try_.chromium_android_builder( name = 'android-binary-size', @@ -54,32 +70,14 @@ try_.chromium_android_builder( properties = { '$build/binary_size': { 'analyze_targets': [ - '//android_webview:system_webview_apk_manifest_expectations', - '//android_webview:trichrome_webview_apk_manifest_expectations', - '//chrome/android:chrome_modern_public_bundle__base_libs_and_assets_expectations', - '//chrome/android:monochrome_public_bundle__base_bundle_module_manifest_expectations', - '//chrome/android:monochrome_public_bundle__base_libs_and_assets_expectations', - '//chrome/android:monochrome_public_bundle_proguard_expectations', + '//chrome/android:validate_expectations', '//chrome/android:monochrome_public_minimal_apks', - '//chrome/android:trichrome_chrome_bundle__base_bundle_module_manifest_expectations', - '//chrome/android:trichrome_chrome_bundle__base_libs_and_assets_expectations', - '//chrome/android:trichrome_library_apk_libs_and_assets_expectations', - '//chrome/android:trichrome_library_apk_manifest_expectations', '//tools/binary_size:binary_size_trybot_py', ], 'compile_targets': [ - 'chrome_modern_public_bundle__base_libs_and_assets_expectations', - 'monochrome_public_bundle__base_bundle_module_manifest_expectations', - 'monochrome_public_bundle__base_libs_and_assets_expectations', - 'monochrome_public_bundle_proguard_expectations', 'monochrome_public_minimal_apks', 'monochrome_static_initializers', - 'system_webview_apk_manifest_expectations', - 'trichrome_chrome_bundle__base_bundle_module_manifest_expectations', - 'trichrome_chrome_bundle__base_libs_and_assets_expectations', - 'trichrome_library_apk_libs_and_assets_expectations', - 'trichrome_library_apk_manifest_expectations', - 'trichrome_webview_apk_manifest_expectations' + 'validate_expectations', ], }, }, @@ -117,7 +115,18 @@ try_.chromium_android_builder( ) try_.chromium_android_builder( + name = 'android-marshmallow-x86-rel', + goma_jobs = goma.jobs.J150, +) + +try_.chromium_android_builder( + name = 'android-nougat-arm64-rel', + goma_jobs = goma.jobs.J150, +) + +try_.chromium_android_builder( name = 'android-pie-arm64-dbg', + goma_jobs = goma.jobs.J300, tryjob = try_.job( location_regexp = [ '.+/[+]/chrome/android/features/vr/.+', @@ -210,25 +219,6 @@ try_.chromium_chromiumos_builder( ) try_.chromium_chromiumos_builder( - name = 'chromeos-kevin-compile-rel', - tryjob = try_.job( - location_regexp = [ - '.+/[+]/chromeos/CHROMEOS_LKGM', - ], - ), -) - -try_.chromium_chromiumos_builder( - name = 'chromeos-kevin-rel', - tryjob = try_.job( - location_regexp = [ - '.+/[+]/build/chromeos/.+', - '.+/[+]/build/config/chromeos/.*', - ], - ), -) - -try_.chromium_chromiumos_builder( name = 'linux-chromeos-compile-dbg', tryjob = try_.job(), ) @@ -358,9 +348,14 @@ try_.chromium_linux_builder( tryjob = try_.job(), ) +# The fuchsia_arm64 builder will now run tests as well as compiles. +# The experiment percentage is used to ramp up the test load while +# monitoring stability and capacity. crbug.com/1042511 try_.chromium_linux_builder( name = 'fuchsia_arm64', - tryjob = try_.job(), + tryjob = try_.job( + experiment_percentage=50, + ), ) try_.chromium_linux_builder( @@ -484,7 +479,7 @@ try_.chromium_mac_ios_builder( name = 'ios-simulator', executable = 'recipe:chromium_trybot', properties = { - 'xcode_build_version': '11c29', + 'xcode_build_version': '11e146', }, tryjob = try_.job(), ) @@ -633,3 +628,43 @@ try_.gpu_chromium_win_builder( ], ), ) + +# Used for listing chrome trybots in chromium's commit-queue.cfg without also +# adding them to chromium's cr-buildbucket.cfg. Note that the recipe these +# builders run allow only known roller accounts when triggered via the CQ. +def chrome_internal_verifier( + *, + builder): + luci.cq_tryjob_verifier( + builder = 'chrome:try/' + builder, + cq_group = settings.cq_group, + includable_only = True, + owner_whitelist = [ + "googlers", + "project-chromium-robot-committers", + ], + ) + +chrome_internal_verifier( + builder = 'mac-chrome-beta', +) + +chrome_internal_verifier( + builder = 'mac-chrome-stable', +) + +chrome_internal_verifier( + builder = 'win-chrome-beta', +) + +chrome_internal_verifier( + builder = 'win-chrome-stable', +) + +chrome_internal_verifier( + builder = 'win64-chrome-beta', +) + +chrome_internal_verifier( + builder = 'win64-chrome-stable', +) diff --git a/chromium/infra/config/subprojects/chromium/versioned/README.md b/chromium/infra/config/subprojects/chromium/versioned/README.md index 09bc955c244..5dd87450b9c 100644 --- a/chromium/infra/config/subprojects/chromium/versioned/README.md +++ b/chromium/infra/config/subprojects/chromium/versioned/README.md @@ -2,7 +2,7 @@ This directory supports our branch CI/CQ configuration. Contents: -* **m81**, **m83** +* **m83**, **m84** * contains subdirectories that contain the versioned configuration for the active milestones * non-dimension changes should be infrequent diff --git a/chromium/infra/config/subprojects/chromium/versioned/m81/buckets/try.star b/chromium/infra/config/subprojects/chromium/versioned/m81/buckets/try.star deleted file mode 100644 index 166be7233c2..00000000000 --- a/chromium/infra/config/subprojects/chromium/versioned/m81/buckets/try.star +++ /dev/null @@ -1,204 +0,0 @@ -load('//lib/builders.star', 'cpu', 'goma', 'os') -load('//lib/try.star', 'try_') -# Load this using relative path so that the load statement doesn't -# need to be changed when making a new milestone -load('../vars.star', 'vars') - - -try_.declare_bucket(vars) - -try_.set_defaults( - vars, - main_list_view = vars.main_list_view_name, -) - - -# Builders are sorted first lexicographically by the function used to define -# them, then lexicographically by their name - - -try_.chromium_android_builder( - name = 'android-binary-size', - executable = 'recipe:binary_size_trybot', - goma_jobs = goma.jobs.J150, - tryjob = try_.job(), -) - -try_.chromium_android_builder( - name = 'android-kitkat-arm-rel', - goma_jobs = goma.jobs.J150, - tryjob = try_.job(), -) - -try_.chromium_android_builder( - name = 'android-lollipop-arm-rel', - goma_jobs = goma.jobs.J150, - tryjob = try_.job(), -) - -try_.chromium_android_builder( - name = 'android-marshmallow-arm64-rel', - cores = 16, - goma_jobs = goma.jobs.J300, - ssd = True, - use_java_coverage = True, - tryjob = try_.job(), -) - -try_.chromium_android_builder( - name = 'android_compile_dbg', - goma_jobs = goma.jobs.J150, - tryjob = try_.job(), -) - -try_.chromium_android_builder( - name = 'android_cronet', - tryjob = try_.job(), -) - -try_.chromium_android_builder( - name = 'cast_shell_android', - tryjob = try_.job(), -) - - -try_.chromium_chromiumos_builder( - name = 'chromeos-arm-generic-rel', - tryjob = try_.job(), -) - -try_.chromium_chromiumos_builder( - name = 'chromeos-amd64-generic-rel', - tryjob = try_.job(), -) - -try_.chromium_chromiumos_builder( - name = 'linux-chromeos-compile-dbg', - tryjob = try_.job(), -) - -try_.chromium_chromiumos_builder( - name = 'linux-chromeos-rel', - goma_jobs = goma.jobs.J150, - tryjob = try_.job(cancel_stale = False), - use_clang_coverage = True, -) - - -try_.chromium_linux_builder( - name = 'cast_shell_linux', - tryjob = try_.job(), -) - -try_.chromium_linux_builder( - name = 'chromium_presubmit', - executable = 'recipe:presubmit', - goma_backend = None, - properties = { - '$depot_tools/presubmit': { - 'runhooks': True, - 'timeout_s': 480, - }, - 'repo_name': 'chromium', - }, - tryjob = try_.job( - disable_reuse = True, - ), -) - -try_.chromium_linux_builder( - name = 'fuchsia_arm64', - tryjob = try_.job(), -) - -try_.chromium_linux_builder( - name = 'fuchsia_x64', - tryjob = try_.job(), -) - -try_.chromium_linux_builder( - name = 'linux-libfuzzer-asan-rel', - executable = 'recipe:chromium_libfuzzer_trybot', - tryjob = try_.job(), -) - -try_.chromium_linux_builder( - name = 'linux-ozone-rel', -) - -try_.chromium_linux_builder( - name = 'linux-rel', - goma_jobs = goma.jobs.J150, - tryjob = try_.job(), - use_clang_coverage = True, -) - -try_.chromium_linux_builder( - name = 'linux_chromium_asan_rel_ng', - goma_jobs = goma.jobs.J150, - ssd = True, - tryjob = try_.job(), -) - -try_.chromium_linux_builder( - name = 'linux_chromium_compile_dbg_ng', - caches = [ - swarming.cache( - name = 'builder', - path = 'linux_debug', - ), - ], - goma_jobs = goma.jobs.J150, - tryjob = try_.job(), -) - -try_.chromium_linux_builder( - name = 'linux_chromium_tsan_rel_ng', - goma_jobs = goma.jobs.J150, - tryjob = try_.job(), -) - - -try_.chromium_mac_builder( - name = 'mac-rel', - goma_jobs = goma.jobs.J150, - os = os.MAC_10_13, - tryjob = try_.job(), -) - -try_.chromium_mac_builder( - name = 'mac_chromium_compile_dbg_ng', - goma_jobs = goma.jobs.J150, - os = os.MAC_10_13, - tryjob = try_.job(), -) - - -try_.chromium_mac_ios_builder( - name = 'ios-simulator', - goma_backend = None, - tryjob = try_.job(), -) - - -try_.chromium_win_builder( - name = 'win-libfuzzer-asan-rel', - builderless = False, - executable = 'recipe:chromium_libfuzzer_trybot', - os = os.WINDOWS_ANY, - tryjob = try_.job(cancel_stale = False), -) - -try_.chromium_win_builder( - name = 'win_chromium_compile_dbg_ng', - goma_jobs = goma.jobs.J150, - tryjob = try_.job(cancel_stale = False), -) - -try_.chromium_win_builder( - name = 'win10_chromium_x64_rel_ng', - goma_jobs = goma.jobs.J150, - os = os.WINDOWS_10, - ssd = True, - tryjob = try_.job(cancel_stale = False), -) diff --git a/chromium/infra/config/subprojects/chromium/versioned/m81/vars.star b/chromium/infra/config/subprojects/chromium/versioned/m81/vars.star deleted file mode 100644 index f69d655bc8e..00000000000 --- a/chromium/infra/config/subprojects/chromium/versioned/m81/vars.star +++ /dev/null @@ -1,14 +0,0 @@ -vars = struct( - is_master = False, - ref = 'refs/branch-heads/4044', - ci_bucket = 'ci-m81', - ci_poller = 'm81-gitiles-trigger', - main_console_name = 'main-m81', - main_console_title = 'Chromium M81 Console', - try_bucket = 'try-m81', - cq_group = 'cq-m81', - cq_ref_regexp = 'refs/branch-heads/4044', - main_list_view_name = 'try-m81', - main_list_view_title = 'Chromium M81 CQ console', - tree_status_host = None, -) diff --git a/chromium/infra/config/subprojects/chromium/versioned/m83/buckets/ci.star b/chromium/infra/config/subprojects/chromium/versioned/m83/buckets/ci.star index 0646408fdca..c8d536e58f8 100644 --- a/chromium/infra/config/subprojects/chromium/versioned/m83/buckets/ci.star +++ b/chromium/infra/config/subprojects/chromium/versioned/m83/buckets/ci.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + load('//lib/builders.star', 'builder_name', 'cpu', 'goma', 'os') load('//lib/ci.star', 'ci') # Load this using relative path so that the load statement doesn't @@ -9,6 +13,7 @@ ci.set_defaults( vars, bucketed_triggers = True, main_console_view = vars.main_console_name, + cq_mirrors_console_view = vars.cq_mirrors_console_name, ) ci.declare_bucket(vars) @@ -222,21 +227,6 @@ ci.chromiumos_builder( ) ci.chromiumos_builder( - name = 'chromeos-kevin-rel', - console_view_entry = ci.console_view_entry( - category = 'simple|release', - short_name = 'kvn', - ), -) - -ci.fyi_builder( - name = 'chromeos-kevin-rel-hw-tests', - console_view_entry = ci.console_view_entry( - category = 'chromeos', - ), -) - -ci.chromiumos_builder( name = 'linux-chromeos-dbg', console_view_entry = ci.console_view_entry( category = 'default', @@ -704,6 +694,7 @@ ci.mac_ios_builder( category = 'ios|default', short_name = 'sim', ), + executable = 'recipe:ios/unified_builder_tester' ) ci.mac_ios_builder( @@ -712,6 +703,7 @@ ci.mac_ios_builder( category = 'ios|default', short_name = 'ful', ), + executable = 'recipe:ios/unified_builder_tester', ) diff --git a/chromium/infra/config/subprojects/chromium/versioned/m83/buckets/try.star b/chromium/infra/config/subprojects/chromium/versioned/m83/buckets/try.star index bebe103d9c3..9f4576ec346 100644 --- a/chromium/infra/config/subprojects/chromium/versioned/m83/buckets/try.star +++ b/chromium/infra/config/subprojects/chromium/versioned/m83/buckets/try.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + load('//lib/builders.star', 'cpu', 'goma', 'os') load('//lib/try.star', 'try_') # Load this using relative path so that the load statement doesn't @@ -159,25 +163,6 @@ try_.chromium_chromiumos_builder( ) try_.chromium_chromiumos_builder( - name = 'chromeos-kevin-compile-rel', - tryjob = try_.job( - location_regexp = [ - '.+/[+]/chromeos/CHROMEOS_LKGM', - ], - ), -) - -try_.chromium_chromiumos_builder( - name = 'chromeos-kevin-rel', - tryjob = try_.job( - location_regexp = [ - '.+/[+]/build/chromeos/.+', - '.+/[+]/build/config/chromeos/.*', - ], - ), -) - -try_.chromium_chromiumos_builder( name = 'linux-chromeos-compile-dbg', tryjob = try_.job(), ) diff --git a/chromium/infra/config/subprojects/chromium/versioned/m83/vars.star b/chromium/infra/config/subprojects/chromium/versioned/m83/vars.star index 295eef9ec14..a53b2396125 100644 --- a/chromium/infra/config/subprojects/chromium/versioned/m83/vars.star +++ b/chromium/infra/config/subprojects/chromium/versioned/m83/vars.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + vars = struct( is_master = False, ref = 'refs/branch-heads/4103', @@ -5,7 +9,10 @@ vars = struct( ci_poller = 'm83-gitiles-trigger', main_console_name = 'main-m83', main_console_title = 'Chromium M83 Console', + cq_mirrors_console_name = 'mirrors-m83', + cq_mirrors_console_title = 'Chromium M83 CQ Mirrors Console', try_bucket = 'try-m83', + try_triggering_projects = [], cq_group = 'cq-m83', cq_ref_regexp = 'refs/branch-heads/4103', main_list_view_name = 'try-m83', diff --git a/chromium/infra/config/subprojects/chromium/versioned/m81/buckets/ci.star b/chromium/infra/config/subprojects/chromium/versioned/m84/buckets/ci.star index cecf812e877..87ac6f19c44 100644 --- a/chromium/infra/config/subprojects/chromium/versioned/m81/buckets/ci.star +++ b/chromium/infra/config/subprojects/chromium/versioned/m84/buckets/ci.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + load('//lib/builders.star', 'builder_name', 'cpu', 'goma', 'os') load('//lib/ci.star', 'ci') # Load this using relative path so that the load statement doesn't @@ -9,6 +13,7 @@ ci.set_defaults( vars, bucketed_triggers = True, main_console_view = vars.main_console_name, + cq_mirrors_console_view = vars.cq_mirrors_console_name, ) ci.declare_bucket(vars) @@ -19,6 +24,42 @@ ci.declare_bucket(vars) ci.android_builder( + name = 'Android WebView M (dbg)', + console_view_entry = ci.console_view_entry( + category = 'tester|webview', + short_name = 'M', + ), + triggered_by = [builder_name('Android arm64 Builder (dbg)')], +) + +ci.android_builder( + name = 'Android WebView N (dbg)', + console_view_entry = ci.console_view_entry( + category = 'tester|webview', + short_name = 'N', + ), + triggered_by = [builder_name('Android arm64 Builder (dbg)')], +) + +ci.android_builder( + name = 'Android WebView O (dbg)', + console_view_entry = ci.console_view_entry( + category = 'tester|webview', + short_name = 'O', + ), + triggered_by = [builder_name('Android arm64 Builder (dbg)')], +) + +ci.android_builder( + name = 'Android WebView P (dbg)', + console_view_entry = ci.console_view_entry( + category = 'tester|webview', + short_name = 'P', + ), + triggered_by = [builder_name('Android arm64 Builder (dbg)')], +) + +ci.android_builder( name = 'Android arm Builder (dbg)', console_view_entry = ci.console_view_entry( category = 'builder|arm', @@ -28,6 +69,33 @@ ci.android_builder( ) ci.android_builder( + name = 'Android arm64 Builder (dbg)', + console_view_entry = ci.console_view_entry( + category = 'builder|arm', + short_name = '64', + ), + goma_jobs = goma.jobs.MANY_JOBS_FOR_CI, + execution_timeout = 4 * time.hour, +) + +ci.android_builder( + name = 'Android x64 Builder (dbg)', + console_view_entry = ci.console_view_entry( + category = 'builder|x86', + short_name = '64', + ), + execution_timeout = 4 * time.hour, +) + +ci.android_builder( + name = 'Android x86 Builder (dbg)', + console_view_entry = ci.console_view_entry( + category = 'builder|x86', + short_name = '32', + ), +) + +ci.android_builder( name = 'Cast Android (dbg)', console_view_entry = ci.console_view_entry( category = 'on_cq', @@ -36,6 +104,42 @@ ci.android_builder( ) ci.android_builder( + name = 'Marshmallow 64 bit Tester', + console_view_entry = ci.console_view_entry( + category = 'tester|phone', + short_name = 'M', + ), + triggered_by = [builder_name('Android arm64 Builder (dbg)')], +) + +ci.android_builder( + name = 'Nougat Phone Tester', + console_view_entry = ci.console_view_entry( + category = 'tester|phone', + short_name = 'N', + ), + triggered_by = [builder_name('Android arm64 Builder (dbg)')], +) + +ci.android_builder( + name = 'Oreo Phone Tester', + console_view_entry = ci.console_view_entry( + category = 'tester|phone', + short_name = 'O', + ), + triggered_by = [builder_name('Android arm64 Builder (dbg)')], +) + +ci.android_builder( + name = 'android-cronet-arm-dbg', + console_view_entry = ci.console_view_entry( + category = 'cronet|arm', + short_name = 'dbg', + ), + notifies = ['cronet'], +) + +ci.android_builder( name = 'android-cronet-arm-rel', console_view_entry = ci.console_view_entry( category = 'cronet|arm', @@ -65,31 +169,48 @@ ci.android_builder( ) ci.android_builder( - name = 'android-kitkat-arm-rel', + name = 'android-lollipop-arm-rel', console_view_entry = ci.console_view_entry( category = 'on_cq', - short_name = 'K', + short_name = 'L', ), ) ci.android_builder( - name = 'android-lollipop-arm-rel', + name = 'android-marshmallow-arm64-rel', console_view_entry = ci.console_view_entry( category = 'on_cq', - short_name = 'L', + short_name = 'M', ), ) ci.android_builder( - name = 'android-marshmallow-arm64-rel', + name = 'android-pie-arm64-dbg', + console_view_entry = ci.console_view_entry( + category = 'tester|phone', + short_name = 'P', + ), + triggered_by = [builder_name('Android arm64 Builder (dbg)')], +) + +ci.android_builder( + name = 'android-pie-arm64-rel', console_view_entry = ci.console_view_entry( category = 'on_cq', - short_name = 'M', + short_name = 'P', ), ) ci.chromiumos_builder( + name = 'chromeos-amd64-generic-dbg', + console_view_entry = ci.console_view_entry( + category = 'simple|debug|x64', + short_name = 'dbg', + ), +) + +ci.chromiumos_builder( name = 'chromeos-amd64-generic-rel', console_view_entry = ci.console_view_entry( category = 'simple|release|x64', @@ -122,6 +243,141 @@ ci.chromiumos_builder( ) +ci.dawn_builder( + name = 'Dawn Linux x64 DEPS Builder', + console_view_entry = ci.console_view_entry( + category = 'DEPS|Linux|Builder', + short_name = 'x64', + ), +) + +ci.dawn_builder( + name = 'Dawn Linux x64 DEPS Release (Intel HD 630)', + console_view_entry = ci.console_view_entry( + category = 'DEPS|Linux|Intel', + short_name = 'x64', + ), + cores = 2, + os = os.LINUX_DEFAULT, + triggered_by = [builder_name('Dawn Linux x64 DEPS Builder')], +) + +ci.dawn_builder( + name = 'Dawn Linux x64 DEPS Release (NVIDIA)', + console_view_entry = ci.console_view_entry( + category = 'DEPS|Linux|Nvidia', + short_name = 'x64', + ), + cores = 2, + os = os.LINUX_DEFAULT, + triggered_by = [builder_name('Dawn Linux x64 DEPS Builder')], +) + +ci.dawn_builder( + name = 'Dawn Mac x64 DEPS Builder', + builderless = False, + console_view_entry = ci.console_view_entry( + category = 'DEPS|Mac|Builder', + short_name = 'x64', + ), + cores = None, + os = os.MAC_ANY, +) + +# Note that the Mac testers are all thin Linux VMs, triggering jobs on the +# physical Mac hardware in the Swarming pool which is why they run on linux +ci.dawn_builder( + name = 'Dawn Mac x64 DEPS Release (AMD)', + console_view_entry = ci.console_view_entry( + category = 'DEPS|Mac|AMD', + short_name = 'x64', + ), + cores = 2, + os = os.LINUX_DEFAULT, + triggered_by = [builder_name('Dawn Mac x64 DEPS Builder')], +) + +ci.dawn_builder( + name = 'Dawn Mac x64 DEPS Release (Intel)', + console_view_entry = ci.console_view_entry( + category = 'DEPS|Mac|Intel', + short_name = 'x64', + ), + cores = 2, + os = os.LINUX_DEFAULT, + triggered_by = [builder_name('Dawn Mac x64 DEPS Builder')], +) + +ci.dawn_builder( + name = 'Dawn Win10 x64 DEPS Builder', + console_view_entry = ci.console_view_entry( + category = 'DEPS|Windows|Builder', + short_name = 'x64', + ), + os = os.WINDOWS_ANY, +) + +ci.dawn_builder( + name = 'Dawn Win10 x64 DEPS Release (Intel HD 630)', + console_view_entry = ci.console_view_entry( + category = 'DEPS|Windows|Intel', + short_name = 'x64', + ), + cores = 2, + os = os.LINUX_DEFAULT, + triggered_by = [builder_name('Dawn Win10 x64 DEPS Builder')], +) + +ci.dawn_builder( + name = 'Dawn Win10 x64 DEPS Release (NVIDIA)', + console_view_entry = ci.console_view_entry( + category = 'DEPS|Windows|Nvidia', + short_name = 'x64', + ), + cores = 2, + os = os.LINUX_DEFAULT, + triggered_by = [builder_name('Dawn Win10 x64 DEPS Builder')], +) + +ci.dawn_builder( + name = 'Dawn Win10 x86 DEPS Builder', + console_view_entry = ci.console_view_entry( + category = 'DEPS|Windows|Builder', + short_name = 'x86', + ), + os = os.WINDOWS_ANY, +) + +ci.dawn_builder( + name = 'Dawn Win10 x86 DEPS Release (Intel HD 630)', + console_view_entry = ci.console_view_entry( + category = 'DEPS|Windows|Intel', + short_name = 'x86', + ), + cores = 2, + os = os.LINUX_DEFAULT, + triggered_by = [builder_name('Dawn Win10 x86 DEPS Builder')], +) + +ci.dawn_builder( + name = 'Dawn Win10 x86 DEPS Release (NVIDIA)', + console_view_entry = ci.console_view_entry( + category = 'DEPS|Windows|Nvidia', + short_name = 'x86', + ), + cores = 2, + os = os.LINUX_DEFAULT, + triggered_by = [builder_name('Dawn Win10 x86 DEPS Builder')], +) + + +ci.fyi_builder( + name = 'VR Linux', + console_view_entry = ci.console_view_entry( + category = 'linux', + ), +) + # This is launching & collecting entirely isolated tests. # OS shouldn't matter. ci.fyi_builder( @@ -135,6 +391,19 @@ ci.fyi_builder( ) +ci.fyi_ios_builder( + name = 'ios-simulator-cronet', + console_view_entry = ci.console_view_entry( + category = 'cronet', + ), + executable = 'recipe:chromium', + notifies = ['cronet'], + properties = { + 'xcode_build_version': '11c29', + }, +) + + ci.fyi_windows_builder( name = 'Win10 Tests x64 1803', console_view_entry = ci.console_view_entry( @@ -225,6 +494,7 @@ ci.linux_builder( name = 'Fuchsia ARM64', console_view_entry = ci.console_view_entry( category = 'fuchsia|a64', + short_name = 'rel', ), notifies = ['cr-fuchsia'], ) @@ -247,6 +517,14 @@ ci.linux_builder( ) ci.linux_builder( + name = 'Linux Builder (dbg)', + console_view_entry = ci.console_view_entry( + category = 'debug|builder', + short_name = '64', + ), +) + +ci.linux_builder( name = 'Linux Tests', console_view_entry = ci.console_view_entry( category = 'release', @@ -257,6 +535,33 @@ ci.linux_builder( ) ci.linux_builder( + name = 'Linux Tests (dbg)(1)', + console_view_entry = ci.console_view_entry( + category = 'debug|tester', + short_name = '64', + ), + triggered_by = [builder_name('Linux Builder (dbg)')], +) + +ci.linux_builder( + name = 'fuchsia-arm64-cast', + console_view_entry = ci.console_view_entry( + category = 'fuchsia|cast', + short_name = 'a64', + ), + notifies = ['cr-fuchsia'], +) + +ci.linux_builder( + name = 'fuchsia-x64-cast', + console_view_entry = ci.console_view_entry( + category = 'fuchsia|cast', + short_name = 'x64', + ), + notifies = ['cr-fuchsia'], +) + +ci.linux_builder( name = 'linux-ozone-rel', console_view_entry = ci.console_view_entry( category = 'release', @@ -271,7 +576,6 @@ ci.linux_builder( category = 'linux', short_name = 'loh', ), - goma_backend = None, triggered_by = [builder_name('linux-ozone-rel')], ) @@ -282,7 +586,6 @@ ci.linux_builder( category = 'linux', short_name = 'low', ), - goma_backend = None, triggered_by = [builder_name('linux-ozone-rel')], ) @@ -293,7 +596,6 @@ ci.linux_builder( category = 'linux', short_name = 'lox', ), - goma_backend = None, triggered_by = [builder_name('linux-ozone-rel')], ) @@ -392,8 +694,15 @@ ci.mac_ios_builder( console_view_entry = ci.console_view_entry( category = 'ios|default', short_name = 'sim', - ), - goma_backend = None, + ) +) + +ci.mac_ios_builder( + name = 'ios-simulator-full-configs', + console_view_entry = ci.console_view_entry( + category = 'ios|default', + short_name = 'ful', + ) ) @@ -424,6 +733,23 @@ ci.memory_builder( triggered_by = [builder_name('Linux ASan LSan Builder')], ) +ci.memory_builder( + name = 'Linux TSan Builder', + console_view_entry = ci.console_view_entry( + category = 'linux|TSan v2', + short_name = 'bld', + ), +) + +ci.memory_builder( + name = 'Linux TSan Tests', + console_view_entry = ci.console_view_entry( + category = 'linux|TSan v2', + short_name = 'tst', + ), + triggered_by = [builder_name('Linux TSan Builder')], +) + ci.win_builder( name = 'Win7 Tests (dbg)(1)', diff --git a/chromium/infra/config/subprojects/chromium/versioned/m84/buckets/try.star b/chromium/infra/config/subprojects/chromium/versioned/m84/buckets/try.star new file mode 100644 index 00000000000..4c7852f1be4 --- /dev/null +++ b/chromium/infra/config/subprojects/chromium/versioned/m84/buckets/try.star @@ -0,0 +1,644 @@ +# Copyright 2020 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. + +load('//lib/builders.star', 'cpu', 'goma', 'os') +load('//lib/try.star', 'try_') +# Load this using relative path so that the load statement doesn't +# need to be changed when making a new milestone +load('../vars.star', 'vars') + + +try_.declare_bucket(vars) + +try_.set_defaults( + vars, + main_list_view = vars.main_list_view_name, +) + + +# Builders are sorted first lexicographically by the function used to define +# them, then lexicographically by their name + + +try_.blink_builder( + name = 'linux-blink-rel', + goma_backend = goma.backend.RBE_PROD, + tryjob = try_.job( + location_regexp = [ + '.+/[+]/cc/.+', + '.+/[+]/third_party/blink/renderer/core/paint/.+', + '.+/[+]/third_party/blink/renderer/core/svg/.+', + '.+/[+]/third_party/blink/renderer/platform/graphics/.+', + ], + ), +) + + +try_.chromium_android_builder( + name = 'android-binary-size', + executable = 'recipe:binary_size_trybot', + goma_jobs = goma.jobs.J150, + properties = { + '$build/binary_size': { + 'analyze_targets': [ + '//android_webview:system_webview_apk_manifest_expectations', + '//android_webview:trichrome_webview_apk_manifest_expectations', + '//chrome/android:chrome_modern_public_bundle__base_libs_and_assets_expectations', + '//chrome/android:monochrome_public_bundle__base_bundle_module_manifest_expectations', + '//chrome/android:monochrome_public_bundle__base_libs_and_assets_expectations', + '//chrome/android:monochrome_public_bundle_proguard_expectations', + '//chrome/android:monochrome_public_minimal_apks', + '//chrome/android:trichrome_chrome_bundle__base_bundle_module_manifest_expectations', + '//chrome/android:trichrome_chrome_bundle__base_libs_and_assets_expectations', + '//chrome/android:trichrome_library_apk_libs_and_assets_expectations', + '//chrome/android:trichrome_library_apk_manifest_expectations', + '//tools/binary_size:binary_size_trybot_py', + ], + 'compile_targets': [ + 'chrome_modern_public_bundle__base_libs_and_assets_expectations', + 'monochrome_public_bundle__base_bundle_module_manifest_expectations', + 'monochrome_public_bundle__base_libs_and_assets_expectations', + 'monochrome_public_bundle_proguard_expectations', + 'monochrome_public_minimal_apks', + 'monochrome_static_initializers', + 'system_webview_apk_manifest_expectations', + 'trichrome_chrome_bundle__base_bundle_module_manifest_expectations', + 'trichrome_chrome_bundle__base_libs_and_assets_expectations', + 'trichrome_library_apk_libs_and_assets_expectations', + 'trichrome_library_apk_manifest_expectations', + 'trichrome_webview_apk_manifest_expectations' + ], + }, + }, + tryjob = try_.job(), +) + +try_.chromium_android_builder( + name = 'android-cronet-arm-dbg', + tryjob = try_.job( + location_regexp = [ + '.+/[+]/components/cronet/.+', + '.+/[+]/components/grpc_support/.+', + '.+/[+]/build/android/.+', + '.+/[+]/build/config/android/.+', + ], + location_regexp_exclude = [ + '.+/[+]/components/cronet/ios/.+', + ], + ), +) + +try_.chromium_android_builder( + name = 'android-lollipop-arm-rel', + goma_jobs = goma.jobs.J150, + tryjob = try_.job(), +) + +try_.chromium_android_builder( + name = 'android-marshmallow-arm64-rel', + cores = 16, + goma_jobs = goma.jobs.J300, + ssd = True, + use_java_coverage = True, + tryjob = try_.job(), +) + +try_.chromium_android_builder( + name = 'android-pie-arm64-dbg', + tryjob = try_.job( + location_regexp = [ + '.+/[+]/chrome/android/features/vr/.+', + '.+/[+]/chrome/android/java/src/org/chromium/chrome/browser/vr/.+', + '.+/[+]/chrome/android/javatests/src/org/chromium/chrome/browser/vr/.+', + '.+/[+]/chrome/browser/vr/.+', + '.+/[+]/content/browser/xr/.+', + '.+/[+]/third_party/gvr-android-sdk/.+', + '.+/[+]/third_party/arcore-android-sdk/.+', + '.+/[+]/third_party/arcore-android-sdk-client/.+', + ], + ), +) + +try_.chromium_android_builder( + name = 'android-pie-arm64-rel', + cores = 16, + goma_jobs = goma.jobs.J300, + ssd = True, + tryjob = try_.job(), +) + +try_.chromium_android_builder( + name = 'android_compile_dbg', + goma_jobs = goma.jobs.J150, + tryjob = try_.job(), +) + +try_.chromium_android_builder( + name = 'android_compile_x64_dbg', + tryjob = try_.job( + location_regexp = [ + '.+/[+]/chrome/android/java/src/org/chromium/chrome/browser/vr/.+', + '.+/[+]/chrome/browser/vr/.+', + '.+/[+]/content/browser/xr/.+', + '.+/[+]/sandbox/linux/seccomp-bpf/.+', + '.+/[+]/sandbox/linux/seccomp-bpf-helpers/.+', + '.+/[+]/sandbox/linux/system_headers/.+', + '.+/[+]/sandbox/linux/tests/.+', + '.+/[+]/third_party/gvr-android-sdk/.+', + ], + ), +) + +try_.chromium_android_builder( + name = 'android_compile_x86_dbg', + tryjob = try_.job( + location_regexp = [ + '.+/[+]/chrome/android/java/src/org/chromium/chrome/browser/vr/.+', + '.+/[+]/chrome/browser/vr/.+', + '.+/[+]/content/browser/xr/.+', + '.+/[+]/sandbox/linux/seccomp-bpf/.+', + '.+/[+]/sandbox/linux/seccomp-bpf-helpers/.+', + '.+/[+]/sandbox/linux/system_headers/.+', + '.+/[+]/sandbox/linux/tests/.+', + '.+/[+]/third_party/gvr-android-sdk/.+', + ], + ), +) + +try_.chromium_android_builder( + name = 'android_cronet', + tryjob = try_.job(), +) + +try_.chromium_android_builder( + name = 'cast_shell_android', + tryjob = try_.job(), +) + + +try_.chromium_chromiumos_builder( + name = 'chromeos-amd64-generic-dbg', + tryjob = try_.job( + location_regexp = [ + '.+/[+]/content/gpu/.+', + '.+/[+]/media/.+', + ], + ), +) + +try_.chromium_chromiumos_builder( + name = 'chromeos-amd64-generic-rel', + tryjob = try_.job(), +) + +try_.chromium_chromiumos_builder( + name = 'chromeos-arm-generic-rel', + tryjob = try_.job(), +) + +try_.chromium_chromiumos_builder( + name = 'linux-chromeos-compile-dbg', + tryjob = try_.job(), +) + +try_.chromium_chromiumos_builder( + name = 'linux-chromeos-rel', + goma_jobs = goma.jobs.J150, + tryjob = try_.job(cancel_stale = False), + use_clang_coverage = True, +) + + +try_.chromium_dawn_builder( + name = 'dawn-linux-x64-deps-rel', + tryjob = try_.job( + location_regexp = [ + '.+/[+]/gpu/.+', + '.+/[+]/testing/buildbot/chromium.dawn.json', + '.+/[+]/third_party/blink/renderer/modules/webgpu/.+', + '.+/[+]/third_party/blink/web_tests/external/wpt/webgpu/.+', + '.+/[+]/third_party/blink/web_tests/wpt_internal/webgpu/.+', + '.+/[+]/third_party/blink/web_tests/WebGPUExpectations', + '.+/[+]/third_party/dawn/.+', + '.+/[+]/tools/clang/scripts/update.py', + '.+/[+]/ui/gl/features.gni', + ], + ), +) + +try_.chromium_dawn_builder( + name = 'dawn-mac-x64-deps-rel', + os = os.MAC_ANY, + tryjob = try_.job( + location_regexp = [ + '.+/[+]/gpu/.+', + '.+/[+]/testing/buildbot/chromium.dawn.json', + '.+/[+]/third_party/blink/renderer/modules/webgpu/.+', + '.+/[+]/third_party/blink/web_tests/external/wpt/webgpu/.+', + '.+/[+]/third_party/blink/web_tests/wpt_internal/webgpu/.+', + '.+/[+]/third_party/blink/web_tests/WebGPUExpectations', + '.+/[+]/third_party/dawn/.+', + '.+/[+]/tools/clang/scripts/update.py', + '.+/[+]/ui/gl/features.gni', + ], + ), +) + +try_.chromium_dawn_builder( + name = 'dawn-win10-x64-deps-rel', + os = os.WINDOWS_ANY, + tryjob = try_.job( + location_regexp = [ + '.+/[+]/gpu/.+', + '.+/[+]/testing/buildbot/chromium.dawn.json', + '.+/[+]/third_party/blink/renderer/modules/webgpu/.+', + '.+/[+]/third_party/blink/web_tests/external/wpt/webgpu/.+', + '.+/[+]/third_party/blink/web_tests/wpt_internal/webgpu/.+', + '.+/[+]/third_party/blink/web_tests/WebGPUExpectations', + '.+/[+]/third_party/dawn/.+', + '.+/[+]/tools/clang/scripts/update.py', + '.+/[+]/ui/gl/features.gni', + ], + ), +) + +try_.chromium_dawn_builder( + name = 'dawn-win10-x86-deps-rel', + os = os.WINDOWS_ANY, + tryjob = try_.job( + location_regexp = [ + '.+/[+]/gpu/.+', + '.+/[+]/testing/buildbot/chromium.dawn.json', + '.+/[+]/third_party/blink/renderer/modules/webgpu/.+', + '.+/[+]/third_party/blink/web_tests/external/wpt/webgpu/.+', + '.+/[+]/third_party/blink/web_tests/wpt_internal/webgpu/.+', + '.+/[+]/third_party/blink/web_tests/WebGPUExpectations', + '.+/[+]/third_party/dawn/.+', + '.+/[+]/tools/clang/scripts/update.py', + '.+/[+]/ui/gl/features.gni', + ], + ), +) + + +try_.chromium_linux_builder( + name = 'cast_shell_linux', + tryjob = try_.job(), +) + +try_.chromium_linux_builder( + name = 'closure_compilation', + executable = 'recipe:closure_compilation', + tryjob = try_.job( + location_regexp = [ + '.+/[+]/third_party/closure_compiler/.+', + ], + ), +) + +try_.chromium_linux_builder( + name = 'chromium_presubmit', + executable = 'recipe:presubmit', + goma_backend = None, + properties = { + '$depot_tools/presubmit': { + 'runhooks': True, + 'timeout_s': 480, + }, + 'repo_name': 'chromium', + }, + tryjob = try_.job( + disable_reuse = True, + ), +) + +try_.chromium_linux_builder( + name = 'fuchsia-arm64-cast', + tryjob = try_.job( + location_regexp = [ + '.+/[+]/chromecast/.+', + ], + ), +) + +try_.chromium_linux_builder( + name = 'fuchsia-x64-cast', + tryjob = try_.job(), +) + +try_.chromium_linux_builder( + name = 'fuchsia_arm64', + tryjob = try_.job(), +) + +try_.chromium_linux_builder( + name = 'fuchsia_x64', + tryjob = try_.job(), +) + +try_.chromium_linux_builder( + name = 'linux-libfuzzer-asan-rel', + executable = 'recipe:chromium_libfuzzer_trybot', + tryjob = try_.job(), +) + +try_.chromium_linux_builder( + name = 'linux-ozone-rel', + tryjob = try_.job(), +) + +try_.chromium_linux_builder( + name = 'linux-rel', + goma_jobs = goma.jobs.J150, + tryjob = try_.job(), + use_clang_coverage = True, +) + +try_.chromium_linux_builder( + name = 'linux_chromium_asan_rel_ng', + goma_jobs = goma.jobs.J150, + ssd = True, + tryjob = try_.job(), +) + +try_.chromium_linux_builder( + name = 'linux_chromium_compile_dbg_ng', + caches = [ + swarming.cache( + name = 'builder', + path = 'linux_debug', + ), + ], + goma_jobs = goma.jobs.J150, + tryjob = try_.job(), +) + +try_.chromium_linux_builder( + name = 'linux_chromium_dbg_ng', + caches = [ + swarming.cache( + name = 'builder', + path = 'linux_debug', + ), + ], + tryjob = try_.job( + location_regexp = [ + '.+/[+]/build/.*check_gn_headers.*', + ], + ), +) + +try_.chromium_linux_builder( + name = 'linux_chromium_tsan_rel_ng', + goma_jobs = goma.jobs.J150, + tryjob = try_.job(), +) + +try_.chromium_linux_builder( + name = 'linux_layout_tests_composite_after_paint', + tryjob = try_.job( + location_regexp = [ + '.+/[+]/third_party/blink/renderer/core/paint/.+', + '.+/[+]/third_party/blink/renderer/core/svg/.+', + '.+/[+]/third_party/blink/renderer/platform/graphics/.+', + '.+/[+]/third_party/blink/web_tests/.+', + ], + ), +) + +try_.chromium_linux_builder( + name = 'linux_layout_tests_layout_ng_disabled', + tryjob = try_.job( + location_regexp = [ + '.+/[+]/third_party/blink/renderer/core/editing/.+', + '.+/[+]/third_party/blink/renderer/core/layout/.+', + '.+/[+]/third_party/blink/renderer/core/paint/.+', + '.+/[+]/third_party/blink/renderer/core/svg/.+', + '.+/[+]/third_party/blink/renderer/platform/fonts/shaping/.+', + '.+/[+]/third_party/blink/renderer/platform/graphics/.+', + '.+/[+]/third_party/blink/web_tests/FlagExpectations/disable-layout-ng', + '.+/[+]/third_party/blink/web_tests/flag-specific/disable-layout-ng/.+', + ], + ), +) + +try_.chromium_linux_builder( + name = 'linux_vr', + tryjob = try_.job( + location_regexp = [ + '.+/[+]/chrome/browser/vr/.+', + '.+/[+]/content/browser/xr/.+', + ], + ), +) + + +try_.chromium_mac_builder( + name = 'mac-rel', + goma_jobs = goma.jobs.J150, + os = os.MAC_10_13, + tryjob = try_.job(), +) + +try_.chromium_mac_builder( + name = 'mac_chromium_compile_dbg_ng', + goma_jobs = goma.jobs.J150, + os = os.MAC_10_13, + tryjob = try_.job(), +) + + +try_.chromium_mac_ios_builder( + name = 'ios-simulator', + executable = 'recipe:chromium_trybot', + properties = { + 'xcode_build_version': '11e146', + }, + tryjob = try_.job(), +) + +try_.chromium_mac_ios_builder( + name = 'ios-simulator-cronet', + executable = 'recipe:chromium_trybot', + tryjob = try_.job( + location_regexp = [ + '.+/[+]/components/cronet/.+', + '.+/[+]/components/grpc_support/.+', + '.+/[+]/ios/.+', + ], + location_regexp_exclude = [ + '.+/[+]/components/cronet/android/.+', + ], + ), +) + +try_.chromium_mac_ios_builder( + name = 'ios-simulator-full-configs', + executable = 'recipe:chromium_trybot', + tryjob = try_.job( + location_regexp = [ + '.+/[+]/ios/.+', + ], + ), +) + + +try_.chromium_win_builder( + name = 'win-libfuzzer-asan-rel', + builderless = False, + executable = 'recipe:chromium_libfuzzer_trybot', + os = os.WINDOWS_ANY, + tryjob = try_.job(cancel_stale = False), +) + +try_.chromium_win_builder( + name = 'win_chromium_compile_dbg_ng', + goma_jobs = goma.jobs.J150, + tryjob = try_.job(cancel_stale = False), +) + +try_.chromium_win_builder( + name = 'win10_chromium_x64_rel_ng', + goma_jobs = goma.jobs.J150, + os = os.WINDOWS_10, + ssd = True, + use_clang_coverage = True, + tryjob = try_.job(cancel_stale = False), +) + + +try_.gpu_chromium_android_builder( + name = 'android_optional_gpu_tests_rel', + tryjob = try_.job( + location_regexp = [ + '.+/[+]/cc/.+', + '.+/[+]/chrome/browser/vr/.+', + '.+/[+]/content/browser/xr/.+', + '.+/[+]/components/viz/.+', + '.+/[+]/content/test/gpu/.+', + '.+/[+]/gpu/.+', + '.+/[+]/media/audio/.+', + '.+/[+]/media/filters/.+', + '.+/[+]/media/gpu/.+', + '.+/[+]/services/viz/.+', + '.+/[+]/testing/trigger_scripts/.+', + '.+/[+]/third_party/blink/renderer/modules/webgl/.+', + '.+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+', + '.+/[+]/tools/clang/scripts/update.py', + '.+/[+]/ui/gl/.+', + ], + ), +) + + +try_.gpu_chromium_linux_builder( + name = 'linux_optional_gpu_tests_rel', + tryjob = try_.job( + location_regexp = [ + '.+/[+]/chrome/browser/vr/.+', + '.+/[+]/content/browser/xr/.+', + '.+/[+]/content/test/gpu/.+', + '.+/[+]/gpu/.+', + '.+/[+]/media/audio/.+', + '.+/[+]/media/filters/.+', + '.+/[+]/media/gpu/.+', + '.+/[+]/testing/buildbot/chromium.gpu.fyi.json', + '.+/[+]/testing/trigger_scripts/.+', + '.+/[+]/third_party/blink/renderer/modules/webgl/.+', + '.+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+', + '.+/[+]/tools/clang/scripts/update.py', + '.+/[+]/ui/gl/.+', + ], + ), +) + + +try_.gpu_chromium_mac_builder( + name = 'mac_optional_gpu_tests_rel', + tryjob = try_.job( + location_regexp = [ + '.+/[+]/chrome/browser/vr/.+', + '.+/[+]/content/browser/xr/.+', + '.+/[+]/content/test/gpu/.+', + '.+/[+]/gpu/.+', + '.+/[+]/media/audio/.+', + '.+/[+]/media/filters/.+', + '.+/[+]/media/gpu/.+', + '.+/[+]/services/shape_detection/.+', + '.+/[+]/testing/buildbot/chromium.gpu.fyi.json', + '.+/[+]/testing/trigger_scripts/.+', + '.+/[+]/third_party/blink/renderer/modules/webgl/.+', + '.+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+', + '.+/[+]/tools/clang/scripts/update.py', + '.+/[+]/ui/gl/.+', + ], + ), +) + + +try_.gpu_chromium_win_builder( + name = 'win_optional_gpu_tests_rel', + builderless = True, + os = os.WINDOWS_DEFAULT, + tryjob = try_.job( + location_regexp = [ + '.+/[+]/chrome/browser/vr/.+', + '.+/[+]/content/browser/xr/.+', + '.+/[+]/content/test/gpu/.+', + '.+/[+]/device/vr/.+', + '.+/[+]/gpu/.+', + '.+/[+]/media/audio/.+', + '.+/[+]/media/filters/.+', + '.+/[+]/media/gpu/.+', + '.+/[+]/testing/buildbot/chromium.gpu.fyi.json', + '.+/[+]/testing/trigger_scripts/.+', + '.+/[+]/third_party/blink/renderer/modules/vr/.+', + '.+/[+]/third_party/blink/renderer/modules/webgl/.+', + '.+/[+]/third_party/blink/renderer/modules/xr/.+', + '.+/[+]/third_party/blink/renderer/platform/graphics/gpu/.+', + '.+/[+]/tools/clang/scripts/update.py', + '.+/[+]/ui/gl/.+', + ], + ), +) + +# Used for listing chrome trybots in chromium's commit-queue.cfg without also +# adding them to chromium's cr-buildbucket.cfg. Note that the recipe these +# builders run allow only known roller accounts when triggered via the CQ. +def chrome_internal_verifier( + *, + builder): + luci.cq_tryjob_verifier( + builder = 'chrome:try/' + builder, + cq_group = vars.cq_group, + includable_only = True, + owner_whitelist = [ + "googlers", + "project-chromium-robot-committers", + ], + ) + +chrome_internal_verifier( + builder = 'mac-chrome-beta', +) + +chrome_internal_verifier( + builder = 'mac-chrome-stable', +) + +chrome_internal_verifier( + builder = 'win-chrome-beta', +) + +chrome_internal_verifier( + builder = 'win-chrome-stable', +) + +chrome_internal_verifier( + builder = 'win64-chrome-beta', +) + +chrome_internal_verifier( + builder = 'win64-chrome-stable', +) diff --git a/chromium/infra/config/subprojects/chromium/versioned/m84/vars.star b/chromium/infra/config/subprojects/chromium/versioned/m84/vars.star new file mode 100644 index 00000000000..9435600d087 --- /dev/null +++ b/chromium/infra/config/subprojects/chromium/versioned/m84/vars.star @@ -0,0 +1,21 @@ +# Copyright 2020 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. + +vars = struct( + is_master = False, + ref = 'refs/branch-heads/4147', + ci_bucket = 'ci-m84', + ci_poller = 'm84-gitiles-trigger', + main_console_name = 'main-m84', + main_console_title = 'Chromium M84 Console', + cq_mirrors_console_name = 'mirrors-m84', + cq_mirrors_console_title = 'Chromium M84 CQ Mirrors Console', + try_bucket = 'try-m84', + try_triggering_projects = [], + cq_group = 'cq-m84', + cq_ref_regexp = 'refs/branch-heads/4147', + main_list_view_name = 'try-m84', + main_list_view_title = 'Chromium M84 CQ console', + tree_status_host = None, +) diff --git a/chromium/infra/config/subprojects/findit/consoles/findit.star b/chromium/infra/config/subprojects/findit/consoles/findit.star index 0d597fed425..b914b7e5f6c 100644 --- a/chromium/infra/config/subprojects/findit/consoles/findit.star +++ b/chromium/infra/config/subprojects/findit/consoles/findit.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + luci.list_view( name = 'findit', entries = [ diff --git a/chromium/infra/config/subprojects/findit/findit.star b/chromium/infra/config/subprojects/findit/findit.star index ca2d9155547..a613e0332ef 100644 --- a/chromium/infra/config/subprojects/findit/findit.star +++ b/chromium/infra/config/subprojects/findit/findit.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + load('//lib/builders.star', 'builder', 'defaults', 'os') luci.bucket( diff --git a/chromium/infra/config/subprojects/findit/main.star b/chromium/infra/config/subprojects/findit/main.star index 72672b973cb..e4fb67947a7 100644 --- a/chromium/infra/config/subprojects/findit/main.star +++ b/chromium/infra/config/subprojects/findit/main.star @@ -1,2 +1,6 @@ +# Copyright 2020 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. + exec('./findit.star') exec('./consoles/findit.star') diff --git a/chromium/infra/config/subprojects/goma/consoles/chromium.goma.fyi.star b/chromium/infra/config/subprojects/goma/consoles/chromium.goma.fyi.star index 94050d2e3a6..267c1527939 100644 --- a/chromium/infra/config/subprojects/goma/consoles/chromium.goma.fyi.star +++ b/chromium/infra/config/subprojects/goma/consoles/chromium.goma.fyi.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + luci.console_view( name = 'chromium.goma.fyi', header = '//chromium-header.textpb', diff --git a/chromium/infra/config/subprojects/goma/consoles/chromium.goma.migration.star b/chromium/infra/config/subprojects/goma/consoles/chromium.goma.migration.star index c2dcd2fb0ca..15f653c07b7 100644 --- a/chromium/infra/config/subprojects/goma/consoles/chromium.goma.migration.star +++ b/chromium/infra/config/subprojects/goma/consoles/chromium.goma.migration.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + # These are used for monitoring builders that have recently been migrated to # Goma RBE (See crbug.com/950413). luci.console_view( @@ -1042,15 +1046,6 @@ luci.console_view( short_name = 'gpu', ), luci.console_view_entry( - builder = 'ci-m81/Win x64 Builder', - category = 'win|week5|stable', - ), - luci.console_view_entry( - builder = 'ci-m81/GPU Win x64 Builder', - category = 'win|week5|stable', - short_name = 'gpu', - ), - luci.console_view_entry( builder = 'ci/linux-chromeos-dbg', category = 'cros|week1', short_name = 'dbg', @@ -1106,11 +1101,6 @@ luci.console_view( short_name = 'dbg', ), luci.console_view_entry( - builder = 'ci/chromeos-amd64-generic-rel-vm-tests', - category = 'cros|week3|amd64', - short_name = 'vmtests', - ), - luci.console_view_entry( builder = 'ci/chromeos-amd64-generic-asan-rel', category = 'cros|week3|amd64', short_name = 'asan', @@ -1136,11 +1126,6 @@ luci.console_view( short_name = 'rel', ), luci.console_view_entry( - builder = 'ci/chromeos-kevin-rel-hw-tests', - category = 'cros|week3|kevin', - short_name = 'hwtests', - ), - luci.console_view_entry( builder = 'webrtc.fyi/WebRTC Chromium FYI ios-device', category = 'ios|week1a', short_name = 'dev', diff --git a/chromium/infra/config/subprojects/goma/consoles/chromium.goma.star b/chromium/infra/config/subprojects/goma/consoles/chromium.goma.star index bcd694ed89d..ed088f6ecae 100644 --- a/chromium/infra/config/subprojects/goma/consoles/chromium.goma.star +++ b/chromium/infra/config/subprojects/goma/consoles/chromium.goma.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + luci.console_view( name = 'chromium.goma', header = '//chromium-header.textpb', diff --git a/chromium/infra/config/subprojects/goma/consoles/goma.latest.star b/chromium/infra/config/subprojects/goma/consoles/goma.latest.star index eea6d126052..3d9885c5b90 100644 --- a/chromium/infra/config/subprojects/goma/consoles/goma.latest.star +++ b/chromium/infra/config/subprojects/goma/consoles/goma.latest.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + luci.console_view( name = 'goma.latest', header = '//chromium-header.textpb', diff --git a/chromium/infra/config/subprojects/goma/consoles/luci.chromium.goma.star b/chromium/infra/config/subprojects/goma/consoles/luci.chromium.goma.star index 9366fd19c69..1de4fac1db5 100644 --- a/chromium/infra/config/subprojects/goma/consoles/luci.chromium.goma.star +++ b/chromium/infra/config/subprojects/goma/consoles/luci.chromium.goma.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + luci.console_view( name = 'luci.chromium.goma', header = '//chromium-header.textpb', diff --git a/chromium/infra/config/subprojects/goma/goma.star b/chromium/infra/config/subprojects/goma/goma.star index 894c7c9a156..f44522e38ec 100644 --- a/chromium/infra/config/subprojects/goma/goma.star +++ b/chromium/infra/config/subprojects/goma/goma.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + load('//lib/builders.star', 'builder', 'cpu', 'defaults', 'goma', 'os', 'xcode_cache') luci.bucket( diff --git a/chromium/infra/config/subprojects/goma/main.star b/chromium/infra/config/subprojects/goma/main.star index 9f29df789b5..1335fddeed2 100644 --- a/chromium/infra/config/subprojects/goma/main.star +++ b/chromium/infra/config/subprojects/goma/main.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + exec('./goma.star') exec('./consoles/chromium.goma.star') exec('./consoles/chromium.goma.fyi.star') diff --git a/chromium/infra/config/subprojects/webrtc/consoles/chromium.webrtc.fyi.star b/chromium/infra/config/subprojects/webrtc/consoles/chromium.webrtc.fyi.star index e1cb8a12007..0a4dffe0ecb 100644 --- a/chromium/infra/config/subprojects/webrtc/consoles/chromium.webrtc.fyi.star +++ b/chromium/infra/config/subprojects/webrtc/consoles/chromium.webrtc.fyi.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + luci.console_view( name = 'chromium.webrtc.fyi', header = '//chromium-header.textpb', diff --git a/chromium/infra/config/subprojects/webrtc/consoles/chromium.webrtc.star b/chromium/infra/config/subprojects/webrtc/consoles/chromium.webrtc.star index 702e18a06de..4dd2efa0251 100644 --- a/chromium/infra/config/subprojects/webrtc/consoles/chromium.webrtc.star +++ b/chromium/infra/config/subprojects/webrtc/consoles/chromium.webrtc.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + luci.console_view( name = 'chromium.webrtc', header = '//chromium-header.textpb', diff --git a/chromium/infra/config/subprojects/webrtc/main.star b/chromium/infra/config/subprojects/webrtc/main.star index 4d43fdb3733..30885e4d131 100644 --- a/chromium/infra/config/subprojects/webrtc/main.star +++ b/chromium/infra/config/subprojects/webrtc/main.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + exec('./webrtc.star') exec('./webrtc.fyi.star') exec('./consoles/chromium.webrtc.star') diff --git a/chromium/infra/config/subprojects/webrtc/webrtc.fyi.star b/chromium/infra/config/subprojects/webrtc/webrtc.fyi.star index 47132c584a0..61c52efef1e 100644 --- a/chromium/infra/config/subprojects/webrtc/webrtc.fyi.star +++ b/chromium/infra/config/subprojects/webrtc/webrtc.fyi.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + load('//lib/builders.star', 'builder', 'cpu', 'defaults', 'goma', 'os', 'xcode_cache') luci.bucket( diff --git a/chromium/infra/config/subprojects/webrtc/webrtc.star b/chromium/infra/config/subprojects/webrtc/webrtc.star index bb363961335..8105b27779e 100644 --- a/chromium/infra/config/subprojects/webrtc/webrtc.star +++ b/chromium/infra/config/subprojects/webrtc/webrtc.star @@ -1,3 +1,7 @@ +# Copyright 2020 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. + load('//lib/builders.star', 'builder', 'cpu', 'defaults', 'goma', 'os') luci.bucket( |