LUCI services configuration: add M81 beta branch, promote M80 to stable.

Also enable branch CQ/CI for Phase C builders.

Bug: 1024643,1047744
Change-Id: If63fcdb223938b0c72b61502d0e61827dd1b70fb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2028258Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Aaron Gable <agable@chromium.org>
Auto-Submit: Garrett Beaty <gbeaty@chromium.org>
Cr-Commit-Position: refs/heads/master@{#737395}

infra/config/buckets/ci.star

@@ -134,11 +134,6 @@ ci.android_builder(
     name = 'Android ASAN (dbg)',
 )
 
-ci.android_builder(
-    name = 'Android WebView L (dbg)',
-    triggered_by = ['Android arm Builder (dbg)'],
-)
-
 ci.android_builder(
     name = 'Android WebView M (dbg)',
     triggered_by = ['Android arm64 Builder (dbg)'],
@@ -159,11 +154,6 @@ ci.android_builder(
     triggered_by = ['Android arm64 Builder (dbg)'],
 )
 
-ci.android_builder(
-    name = 'Android arm Builder (dbg)',
-    execution_timeout = 4 * time.hour,
-)
-
 ci.android_builder(
     name = 'Android arm64 Builder (dbg)',
     goma_jobs = goma.jobs.MANY_JOBS_FOR_CI,
@@ -179,11 +169,6 @@ ci.android_builder(
     name = 'Android x86 Builder (dbg)',
 )
 
-ci.android_builder(
-    name = 'Cast Android (dbg)',
-)
-
-
 ci.android_builder(
     name = 'Deterministic Android',
     executable = 'recipe:swarming/deterministic_build',
@@ -196,45 +181,11 @@ ci.android_builder(
     execution_timeout = 6 * time.hour,
 )
 
-ci.android_builder(
-    name = 'KitKat Phone Tester (dbg)',
-    triggered_by = ['Android arm Builder (dbg)'],
-)
-
-ci.android_builder(
-    name = 'KitKat Tablet Tester',
-    # We have limited tablet capacity and thus limited ability to run
-    # tests in parallel, hence the high timeout.
-    execution_timeout = 10 * time.hour,
-    triggered_by = ['Android arm Builder (dbg)'],
-)
-
-ci.android_builder(
-    name = 'Lollipop Phone Tester',
-    triggered_by = ['Android arm Builder (dbg)'],
-)
-
-ci.android_builder(
-    name = 'Lollipop Tablet Tester',
-    # We have limited tablet capacity and thus limited ability to run
-    # tests in parallel, hence the high timeout.
-    execution_timeout = 10 * time.hour,
-    triggered_by = ['Android arm Builder (dbg)'],
-)
-
 ci.android_builder(
     name = 'Marshmallow 64 bit Tester',
     triggered_by = ['Android arm64 Builder (dbg)'],
 )
 
-ci.android_builder(
-    name = 'Marshmallow Tablet Tester',
-    # We have limited tablet capacity and thus limited ability to run
-    # tests in parallel, hence the high timeout.
-    execution_timeout = 8 * time.hour,
-    triggered_by = ['Android arm Builder (dbg)'],
-)
-
 ci.android_builder(
     name = 'Nougat Phone Tester',
     triggered_by = ['Android arm64 Builder (dbg)'],
@@ -256,11 +207,6 @@ ci.android_builder(
     notifies = ['cronet'],
 )
 
-ci.android_builder(
-    name = 'android-cronet-arm-rel',
-    notifies = ['cronet'],
-)
-
 ci.android_builder(
     name = 'android-cronet-arm64-dbg',
     notifies = ['cronet'],
@@ -276,18 +222,6 @@ ci.android_builder(
     notifies = ['cronet'],
 )
 
-ci.android_builder(
-    name = 'android-cronet-kitkat-arm-rel',
-    notifies = ['cronet'],
-    triggered_by = ['android-cronet-arm-rel'],
-)
-
-ci.android_builder(
-    name = 'android-cronet-lollipop-arm-rel',
-    notifies = ['cronet'],
-    triggered_by = ['android-cronet-arm-rel'],
-)
-
 # Runs on a specific machine with an attached phone
 ci.android_builder(
     name = 'android-cronet-marshmallow-arm64-perf-rel',
@@ -440,18 +374,10 @@ ci.chromiumos_builder(
     name = 'chromeos-arm-generic-dbg',
 )
 
-ci.chromiumos_builder(
-    name = 'chromeos-arm-generic-rel',
-)
-
 ci.chromiumos_builder(
     name = 'chromeos-kevin-rel',
 )
 
-ci.chromiumos_builder(
-    name = 'linux-chromeos-dbg',
-)
-
 
 ci.clang_builder(
     name = 'CFI Linux CF',
@@ -1703,21 +1629,11 @@ ci.gpu_fyi_windows_builder(
 )
 
 
-ci.linux_builder(
-    name = 'Fuchsia x64',
-    notifies = ['cr-fuchsia'],
-)
-
 ci.linux_builder(
     name = 'Cast Audio Linux',
     ssd = True,
 )
 
-ci.linux_builder(
-    name = 'Cast Linux',
-    goma_jobs = goma.jobs.J50,
-)
-
 ci.linux_builder(
     name = 'Deterministic Fuchsia (dbg)',
     executable = 'recipe:swarming/deterministic_build',
@@ -1738,11 +1654,6 @@ ci.linux_builder(
     execution_timeout = 6 * time.hour,
 )
 
-ci.linux_builder(
-    name = 'Fuchsia ARM64',
-    notifies = ['cr-fuchsia'],
-)
-
 ci.linux_builder(
     name = 'Leak Detection Linux',
 )
@@ -1780,10 +1691,6 @@ ci.linux_builder(
     goma_backend = None,
 )
 
-ci.linux_builder(
-    name = 'linux-ozone-rel',
-)
-
 ci.linux_builder(
     name = 'linux-trusty-rel',
     os = os.LINUX_TRUSTY,
@@ -1798,18 +1705,6 @@ ci.linux_builder(
 )
 
 
-ci.mac_builder(
-    name = 'Mac Builder (dbg)',
-    os = os.MAC_ANY,
-)
-
-ci.mac_builder(
-    name = 'Mac10.13 Tests (dbg)',
-    os = os.MAC_ANY,
-    triggered_by = ['Mac Builder (dbg)'],
-)
-
-
 ci.mac_ios_builder(
     name = 'ios-device',
 )
@@ -1839,21 +1734,6 @@ ci.memory_builder(
     execution_timeout = time.hour * 9 / 2,  # 4.5 (can't multiply float * duration)
 )
 
-ci.memory_builder(
-    name = 'Linux ASan LSan Builder',
-    ssd = True,
-)
-
-ci.memory_builder(
-    name = 'Linux ASan LSan Tests (1)',
-    triggered_by = ['Linux ASan LSan Builder'],
-)
-
-ci.memory_builder(
-    name = 'Linux ASan Tests (sandboxed)',
-    triggered_by = ['Linux ASan LSan Builder'],
-)
-
 ci.memory_builder(
     name = 'Linux CFI',
     cores = 32,
@@ -2006,12 +1886,6 @@ ci.win_builder(
     os = os.WINDOWS_ANY,
 )
 
-ci.win_builder(
-    name = 'Win Builder (dbg)',
-    cores = 32,
-    os = os.WINDOWS_ANY,
-)
-
 ci.win_builder(
     name = 'Win x64 Builder (dbg)',
     cores = 32,
@@ -2036,12 +1910,6 @@ ci.win_builder(
     triggered_by = ['Win Builder'],
 )
 
-ci.win_builder(
-    name = 'Win7 Tests (dbg)(1)',
-    os = os.WINDOWS_7,
-    triggered_by = ['Win Builder (dbg)'],
-)
-
 ci.win_builder(
     name = 'Windows deterministic',
     executable = 'recipe:swarming/deterministic_build',

infra/config/buckets/try.star

@@ -102,13 +102,6 @@ try_.chromium_android_builder(
     name = 'android-bfcache-debug',
 )
 
-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-cronet-arm-dbg',
     tryjob = try_.job(
@@ -237,12 +230,6 @@ try_.chromium_android_builder(
     goma_jobs = goma.jobs.J300,
 )
 
-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(
@@ -273,10 +260,6 @@ try_.chromium_android_builder(
     ),
 )
 
-try_.chromium_android_builder(
-    name = 'android_cronet',
-    tryjob = try_.job(),
-)
 
 try_.chromium_android_builder(
     name = 'android_cronet_tester',
@@ -297,10 +280,6 @@ try_.chromium_android_builder(
     name = 'android_unswarmed_pixel_aosp',
 )
 
-try_.chromium_android_builder(
-    name = 'cast_shell_android',
-    tryjob = try_.job(),
-)
 
 try_.chromium_android_builder(
     name = 'linux_android_dbg_ng',
@@ -396,10 +375,6 @@ try_.chromium_chromiumos_builder(
     name = 'chromeos-arm-generic-dbg',
 )
 
-try_.chromium_chromiumos_builder(
-    name = 'chromeos-arm-generic-rel',
-    tryjob = try_.job(),
-)
 
 try_.chromium_chromiumos_builder(
     name = 'chromeos-kevin-compile-rel',
@@ -420,10 +395,6 @@ try_.chromium_chromiumos_builder(
     ),
 )
 
-try_.chromium_chromiumos_builder(
-    name = 'linux-chromeos-compile-dbg',
-    tryjob = try_.job(),
-)
 
 try_.chromium_chromiumos_builder(
     name = 'linux-chromeos-dbg',
@@ -520,10 +491,6 @@ try_.chromium_linux_builder(
     name = 'cast_shell_audio_linux',
 )
 
-try_.chromium_linux_builder(
-    name = 'cast_shell_linux',
-    tryjob = try_.job(),
-)
 
 try_.chromium_linux_builder(
     name = 'closure_compilation',
@@ -572,15 +539,6 @@ try_.chromium_linux_builder(
     ),
 )
 
-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 = 'layout_test_leak_detection',
@@ -627,16 +585,6 @@ try_.chromium_linux_builder(
     goma_backend = None,
 )
 
-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-trusty-rel',
@@ -664,13 +612,6 @@ try_.chromium_linux_builder(
     name = 'linux_chromium_archive_rel_ng',
 )
 
-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_cfi_rel_ng',
     cores = 32,
@@ -700,17 +641,6 @@ try_.chromium_linux_builder(
     name = 'linux_chromium_compile_dbg_32_ng',
 )
 
-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_compile_rel_ng',
@@ -736,11 +666,6 @@ try_.chromium_linux_builder(
     goma_jobs = goma.jobs.J150,
 )
 
-try_.chromium_linux_builder(
-    name = 'linux_chromium_tsan_rel_ng',
-    goma_jobs = goma.jobs.J150,
-    tryjob = try_.job(),
-)
 
 try_.chromium_linux_builder(
     name = 'linux_chromium_ubsan_rel_ng',
@@ -852,12 +777,6 @@ try_.chromium_mac_builder(
     goma_jobs = goma.jobs.J150,
 )
 
-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_builder(
     name = 'mac_chromium_compile_rel_ng',
@@ -1018,14 +937,6 @@ try_.chromium_win_builder(
     },
 )
 
-try_.chromium_win_builder(
-    name = 'win-libfuzzer-asan-rel',
-    builderless = False,
-    executable = 'recipe:chromium_libfuzzer_trybot',
-    os = os.WINDOWS_ANY,
-    tryjob = try_.job(),
-)
-
 try_.chromium_win_builder(
     name = 'win10_chromium_x64_dbg_ng',
     os = os.WINDOWS_10,
@@ -1057,11 +968,6 @@ try_.chromium_win_builder(
     name = 'win_archive',
 )
 
-try_.chromium_win_builder(
-    name = 'win_chromium_compile_dbg_ng',
-    goma_jobs = goma.jobs.J150,
-    tryjob = try_.job(),
-)
 
 try_.chromium_win_builder(
     name = 'win_chromium_compile_rel_ng',

infra/config/consoles/main-beta.star

@@ -5,7 +5,7 @@ luci.console_view(
     repo = 'https://chromium.googlesource.com/chromium/src',
     # TODO(gbeaty) Define the main consoles inside the respective versioned
     # directories once their contents are stablilized
-    refs = ['refs/branch-heads/3987'],
+    refs = ['refs/branch-heads/4044'],
     title = 'Chromium Beta Console',
     entries = [
         luci.console_view_entry(
@@ -18,11 +18,40 @@ luci.console_view(
             category = 'chromium.linux|release',
             short_name = 'tst',
         ),
+        luci.console_view_entry(
+            builder = 'ci-beta/linux-ozone-rel',
+            category = 'chromium.linux|release',
+            short_name = 'ozo',
+        ),
+        luci.console_view_entry(
+            builder = 'ci-beta/Cast Linux',
+            category = 'chromium.linux|cast',
+            short_name = 'vid',
+        ),
+        luci.console_view_entry(
+            builder = 'ci-beta/Fuchsia ARM64',
+            category = 'chromium.linux|fuchsia|a64',
+        ),
+        luci.console_view_entry(
+            builder = 'ci-beta/Fuchsia x64',
+            category = 'chromium.linux|fuchsia|x64',
+            short_name = 'rel',
+        ),
         luci.console_view_entry(
             builder = 'ci-beta/linux-chromeos-rel',
             category = 'chromium.chromiumos|default',
             short_name = 'rel',
         ),
+        luci.console_view_entry(
+            builder = 'ci-beta/linux-chromeos-dbg',
+            category = 'chromium.chromiumos|default',
+            short_name = 'dbg',
+        ),
+        luci.console_view_entry(
+            builder = 'ci-beta/chromeos-arm-generic-rel',
+            category = 'chromium.chromiumos|simple|release',
+            short_name = 'arm',
+        ),
         luci.console_view_entry(
             builder = 'ci-beta/chromeos-amd64-generic-rel',
             category = 'chromium.chromiumos|simple|release|x64',
@@ -58,6 +87,16 @@ luci.console_view(
             category = 'chromium.mac|release',
             short_name = 'ret',
         ),
+        luci.console_view_entry(
+            builder = 'ci-beta/Mac Builder (dbg)',
+            category = 'chromium.mac|debug',
+            short_name = 'bld',
+        ),
+        luci.console_view_entry(
+            builder = 'ci-beta/Mac10.13 Tests (dbg)',
+            category = 'chromium.mac|debug',
+            short_name = '13',
+        ),
         luci.console_view_entry(
             builder = 'ci-beta/ios-simulator',
             category = 'chromium.mac|ios|default',
@@ -78,6 +117,31 @@ luci.console_view(
             category = 'chromium.win|release|tester',
             short_name = 'w10',
         ),
+        luci.console_view_entry(
+            builder = 'ci-beta/Win Builder (dbg)',
+            category = 'chromium.win|debug|builder',
+            short_name = '32',
+        ),
+        luci.console_view_entry(
+            builder = 'ci-beta/Win7 Tests (dbg)(1)',
+            category = 'chromium.win|debug|tester',
+            short_name = '7',
+        ),
+        luci.console_view_entry(
+            builder = 'ci-beta/Linux ASan LSan Builder',
+            category = 'chromium.memory|linux|asan lsan',
+            short_name = 'bld',
+        ),
+        luci.console_view_entry(
+            builder = 'ci-beta/Linux ASan LSan Tests (1)',
+            category = 'chromium.memory|linux|asan lsan',
+            short_name = 'tst',
+        ),
+        luci.console_view_entry(
+            builder = 'ci-beta/Linux ASan Tests (sandboxed)',
+            category = 'chromium.memory|linux|asan lsan',
+            short_name = 'sbx',
+        ),
         # TODO(https://crbug.com/922150) Add the following builders to the main
         # console or don't have them be mirrored by main waterfall trybots
         luci.console_view_entry(
@@ -90,6 +154,61 @@ luci.console_view(
             category = 'chromium.android',
             short_name = 'm',
         ),
+        luci.console_view_entry(
+            builder = 'ci-beta/Cast Android (dbg)',
+            category = 'chromium.android',
+            short_name = 'cst',
+        ),
+        luci.console_view_entry(
+            builder = 'ci-beta/Android arm Builder (dbg)',
+            category = 'chromium.android|builder|arm',
+            short_name = '32',
+        ),
+        luci.console_view_entry(
+            builder = 'ci-beta/KitKat Phone Tester (dbg)',
+            category = 'chromium.android|tester|phone',
+            short_name = 'K',
+        ),
+        luci.console_view_entry(
+            builder = 'ci-beta/Lollipop Phone Tester',
+            category = 'chromium.android|tester|phone',
+            short_name = 'L',
+        ),
+        luci.console_view_entry(
+            builder = 'ci-beta/KitKat Tablet Tester',
+            category = 'chromium.android|tester|tablet',
+            short_name = 'K',
+        ),
+        luci.console_view_entry(
+            builder = 'ci-beta/Lollipop Tablet Tester',
+            category = 'chromium.android|tester|tablet',
+            short_name = 'L',
+        ),
+        luci.console_view_entry(
+            builder = 'ci-beta/Marshmallow Tablet Tester',
+            category = 'chromium.android|tester|tablet',
+            short_name = 'M',
+        ),
+        luci.console_view_entry(
+            builder = 'ci-beta/Android WebView L (dbg)',
+            category = 'chromium.android|tester|webview',
+            short_name = 'L',
+        ),
+        luci.console_view_entry(
+            builder = 'ci-beta/android-cronet-arm-rel',
+            category = 'chromium.android|cronet|arm',
+            short_name = 'rel',
+        ),
+        luci.console_view_entry(
+            builder = 'ci-beta/android-cronet-kitkat-arm-rel',
+            category = 'chromium.android|cronet|test',
+            short_name = 'k',
+        ),
+        luci.console_view_entry(
+            builder = 'ci-beta/android-cronet-lollipop-arm-rel',
+            category = 'chromium.android|cronet|test',
+            short_name = 'l',
+        ),
         luci.console_view_entry(
             builder = 'ci-beta/mac-osxbeta-rel',
             category = 'chromium.fyi|mac',

infra/config/consoles/main-stable.star

@@ -5,7 +5,7 @@ luci.console_view(
     repo = 'https://chromium.googlesource.com/chromium/src',
     # TODO(gbeaty) Define the main consoles inside the respective versioned
     # directories once their contents are stablilized
-    refs = ['refs/branch-heads/3945'],
+    refs = ['refs/branch-heads/3987'],
     title = 'Chromium Stable Console',
     entries = [
         luci.console_view_entry(

infra/config/consoles/try-beta.star

 luci.list_view(
     name = 'try-beta',
     entries = [
+        'try-beta/android-binary-size',
         'try-beta/android-kitkat-arm-rel',
         'try-beta/android-marshmallow-arm64-rel',
+        'try-beta/android_compile_dbg',
+        'try-beta/android_cronet',
+        'try-beta/cast_shell_android',
+        'try-beta/cast_shell_linux',
         'try-beta/chromeos-amd64-generic-rel',
+        'try-beta/chromeos-arm-generic-rel',
         'try-beta/chromium_presubmit',
+        'try-beta/fuchsia_arm64',
+        'try-beta/fuchsia_x64',
         'try-beta/ios-simulator',
+        'try-beta/linux-chromeos-compile-dbg',
         'try-beta/linux-chromeos-rel',
+        'try-beta/linux-libfuzzer-asan-rel',
+        'try-beta/linux-ozone-rel',
         'try-beta/linux-rel',
+        'try-beta/linux_chromium_asan_rel_ng',
+        'try-beta/linux_chromium_compile_dbg_ng',
+        'try-beta/linux_chromium_tsan_rel_ng',
         'try-beta/mac-rel',
+        'try-beta/mac_chromium_compile_dbg_ng',
+        'try-beta/win-libfuzzer-asan-rel',
         'try-beta/win10_chromium_x64_rel_ng',
+        'try-beta/win_chromium_compile_dbg_ng',
     ],
 )

infra/config/generated/commit-queue.cfg

@@ -1190,7 +1190,7 @@ config_groups: <
     url: "https://chromium-review.googlesource.com"
     projects: <
       name: "chromium/src"
-      ref_regexp: "refs/branch-heads/3987"
+      ref_regexp: "refs/branch-heads/4044"
     >
   >
   verifiers: <
@@ -1202,34 +1202,85 @@ config_groups: <
       url: "https://chromium-status.appspot.com/"
     >
     tryjob: <
+      builders: <
+        name: "chromium/try-beta/android-binary-size"
+      >
       builders: <
         name: "chromium/try-beta/android-kitkat-arm-rel"
       >
       builders: <
         name: "chromium/try-beta/android-marshmallow-arm64-rel"
       >
+      builders: <
+        name: "chromium/try-beta/android_compile_dbg"
+      >
+      builders: <
+        name: "chromium/try-beta/android_cronet"
+      >
+      builders: <
+        name: "chromium/try-beta/cast_shell_android"
+      >
+      builders: <
+        name: "chromium/try-beta/cast_shell_linux"
+      >
       builders: <
         name: "chromium/try-beta/chromeos-amd64-generic-rel"
       >
+      builders: <
+        name: "chromium/try-beta/chromeos-arm-generic-rel"
+      >
       builders: <
         name: "chromium/try-beta/chromium_presubmit"
         disable_reuse: true
       >
+      builders: <
+        name: "chromium/try-beta/fuchsia_arm64"
+      >
+      builders: <
+        name: "chromium/try-beta/fuchsia_x64"
+      >
       builders: <
         name: "chromium/try-beta/ios-simulator"
       >
+      builders: <
+        name: "chromium/try-beta/linux-chromeos-compile-dbg"
+      >
       builders: <
         name: "chromium/try-beta/linux-chromeos-rel"
       >
+      builders: <
+        name: "chromium/try-beta/linux-libfuzzer-asan-rel"
+      >
+      builders: <
+        name: "chromium/try-beta/linux-ozone-rel"
+      >
       builders: <
         name: "chromium/try-beta/linux-rel"
       >
+      builders: <
+        name: "chromium/try-beta/linux_chromium_asan_rel_ng"
+      >
+      builders: <
+        name: "chromium/try-beta/linux_chromium_compile_dbg_ng"
+      >
+      builders: <
+        name: "chromium/try-beta/linux_chromium_tsan_rel_ng"
+      >
       builders: <
         name: "chromium/try-beta/mac-rel"
       >
+      builders: <
+        name: "chromium/try-beta/mac_chromium_compile_dbg_ng"
+      >
+      builders: <
+        name: "chromium/try-beta/win-libfuzzer-asan-rel"
+      >
       builders: <
         name: "chromium/try-beta/win10_chromium_x64_rel_ng"
       >
+      builders: <
+        name: "chromium/try-beta/win_chromium_compile_dbg_ng"
+      >
       retry_config: <
         single_quota: 1
         global_quota: 2
@@ -1247,7 +1298,7 @@ config_groups: <
     url: "https://chromium-review.googlesource.com"
     projects: <
       name: "chromium/src"
-      ref_regexp: "refs/branch-heads/3945"
+      ref_regexp: "refs/branch-heads/3987"
     >
   >
   verifiers: <
@@ -1261,40 +1312,31 @@ config_groups: <
     tryjob: <
       builders: <
         name: "chromium/try-stable/android-kitkat-arm-rel"
-        experiment_percentage: 1
       >
       builders: <
         name: "chromium/try-stable/android-marshmallow-arm64-rel"
-        experiment_percentage: 1
       >
       builders: <
         name: "chromium/try-stable/chromeos-amd64-generic-rel"
-        experiment_percentage: 1
       >
       builders: <
         name: "chromium/try-stable/chromium_presubmit"
         disable_reuse: true
-        experiment_percentage: 100
       >
       builders: <
         name: "chromium/try-stable/ios-simulator"
-        experiment_percentage: 1
       >
       builders: <
         name: "chromium/try-stable/linux-chromeos-rel"
-        experiment_percentage: 1
       >
       builders: <
         name: "chromium/try-stable/linux-rel"
-        experiment_percentage: 1
       >
       builders: <
         name: "chromium/try-stable/mac-rel"
-        experiment_percentage: 1
       >
       builders: <
         name: "chromium/try-stable/win10_chromium_x64_rel_ng"
-        experiment_percentage: 1
       >
       retry_config: <
         single_quota: 1

infra/config/generated/luci-milo.cfg

@@ -11023,7 +11023,7 @@ consoles: <
   id: "main-beta"
   name: "Chromium Beta Console"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/3987"
+  refs: "regexp:refs/branch-heads/4044"
   manifest_name: "REVISION"
   builders: <
     name: "buildbucket/luci.chromium.ci-beta/Linux Builder"
@@ -11035,11 +11035,40 @@ consoles: <
     category: "chromium.linux|release"
     short_name: "tst"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/linux-ozone-rel"
+    category: "chromium.linux|release"
+    short_name: "ozo"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/Cast Linux"
+    category: "chromium.linux|cast"
+    short_name: "vid"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/Fuchsia ARM64"
+    category: "chromium.linux|fuchsia|a64"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/Fuchsia x64"
+    category: "chromium.linux|fuchsia|x64"
+    short_name: "rel"
+  >
   builders: <
     name: "buildbucket/luci.chromium.ci-beta/linux-chromeos-rel"
     category: "chromium.chromiumos|default"
     short_name: "rel"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/linux-chromeos-dbg"
+    category: "chromium.chromiumos|default"
+    short_name: "dbg"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/chromeos-arm-generic-rel"
+    category: "chromium.chromiumos|simple|release"
+    short_name: "arm"
+  >
   builders: <
     name: "buildbucket/luci.chromium.ci-beta/chromeos-amd64-generic-rel"
     category: "chromium.chromiumos|simple|release|x64"
@@ -11075,6 +11104,16 @@ consoles: <
     category: "chromium.mac|release"
     short_name: "ret"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/Mac Builder (dbg)"
+    category: "chromium.mac|debug"
+    short_name: "bld"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/Mac10.13 Tests (dbg)"
+    category: "chromium.mac|debug"
+    short_name: "13"
+  >
   builders: <
     name: "buildbucket/luci.chromium.ci-beta/ios-simulator"
     category: "chromium.mac|ios|default"
@@ -11095,6 +11134,31 @@ consoles: <
     category: "chromium.win|release|tester"
     short_name: "w10"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/Win Builder (dbg)"
+    category: "chromium.win|debug|builder"
+    short_name: "32"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/Win7 Tests (dbg)(1)"
+    category: "chromium.win|debug|tester"
+    short_name: "7"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/Linux ASan LSan Builder"
+    category: "chromium.memory|linux|asan lsan"
+    short_name: "bld"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/Linux ASan LSan Tests (1)"
+    category: "chromium.memory|linux|asan lsan"
+    short_name: "tst"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/Linux ASan Tests (sandboxed)"
+    category: "chromium.memory|linux|asan lsan"
+    short_name: "sbx"
+  >
   builders: <
     name: "buildbucket/luci.chromium.ci-beta/android-kitkat-arm-rel"
     category: "chromium.android"
@@ -11105,6 +11169,61 @@ consoles: <
     category: "chromium.android"
     short_name: "m"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/Cast Android (dbg)"
+    category: "chromium.android"
+    short_name: "cst"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/Android arm Builder (dbg)"
+    category: "chromium.android|builder|arm"
+    short_name: "32"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/KitKat Phone Tester (dbg)"
+    category: "chromium.android|tester|phone"
+    short_name: "K"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/Lollipop Phone Tester"
+    category: "chromium.android|tester|phone"
+    short_name: "L"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/KitKat Tablet Tester"
+    category: "chromium.android|tester|tablet"
+    short_name: "K"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/Lollipop Tablet Tester"
+    category: "chromium.android|tester|tablet"
+    short_name: "L"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/Marshmallow Tablet Tester"
+    category: "chromium.android|tester|tablet"
+    short_name: "M"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/Android WebView L (dbg)"
+    category: "chromium.android|tester|webview"
+    short_name: "L"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/android-cronet-arm-rel"
+    category: "chromium.android|cronet|arm"
+    short_name: "rel"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/android-cronet-kitkat-arm-rel"
+    category: "chromium.android|cronet|test"
+    short_name: "k"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci-beta/android-cronet-lollipop-arm-rel"
+    category: "chromium.android|cronet|test"
+    short_name: "l"
+  >
   builders: <
     name: "buildbucket/luci.chromium.ci-beta/mac-osxbeta-rel"
     category: "chromium.fyi|mac"
@@ -11398,7 +11517,7 @@ consoles: <
   id: "main-stable"
   name: "Chromium Stable Console"
   repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "regexp:refs/branch-heads/3945"
+  refs: "regexp:refs/branch-heads/3987"
   manifest_name: "REVISION"
   builders: <
     name: "buildbucket/luci.chromium.ci-stable/Linux Builder"
@@ -12071,33 +12190,84 @@ consoles: <
 consoles: <
   id: "try-beta"
   name: "try-beta"
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/android-binary-size"
+  >
   builders: <
     name: "buildbucket/luci.chromium.try-beta/android-kitkat-arm-rel"
   >
   builders: <
     name: "buildbucket/luci.chromium.try-beta/android-marshmallow-arm64-rel"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/android_compile_dbg"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/android_cronet"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/cast_shell_android"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/cast_shell_linux"
+  >
   builders: <
     name: "buildbucket/luci.chromium.try-beta/chromeos-amd64-generic-rel"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/chromeos-arm-generic-rel"
+  >
   builders: <
     name: "buildbucket/luci.chromium.try-beta/chromium_presubmit"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/fuchsia_arm64"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/fuchsia_x64"
+  >
   builders: <
     name: "buildbucket/luci.chromium.try-beta/ios-simulator"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/linux-chromeos-compile-dbg"
+  >
   builders: <
     name: "buildbucket/luci.chromium.try-beta/linux-chromeos-rel"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/linux-libfuzzer-asan-rel"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/linux-ozone-rel"
+  >
   builders: <
     name: "buildbucket/luci.chromium.try-beta/linux-rel"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/linux_chromium_asan_rel_ng"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/linux_chromium_compile_dbg_ng"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/linux_chromium_tsan_rel_ng"
+  >
   builders: <
     name: "buildbucket/luci.chromium.try-beta/mac-rel"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/mac_chromium_compile_dbg_ng"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/win-libfuzzer-asan-rel"
+  >
   builders: <
     name: "buildbucket/luci.chromium.try-beta/win10_chromium_x64_rel_ng"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.try-beta/win_chromium_compile_dbg_ng"
+  >
   builder_view_only: true
 >
 consoles: <

infra/config/generated/luci-notify.cfg

@@ -664,3 +664,66 @@ notifiers: <
     repository: "https://chromium.googlesource.com/chromium/src"
   >
 >
+notifiers: <
+  notifications: <
+    on_change: true
+    email: <
+      recipients: "cr-fuchsia+bot@chromium.org"
+    >
+  >
+  builders: <
+    bucket: "ci-beta"
+    name: "Fuchsia ARM64"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  >
+>
+notifiers: <
+  notifications: <
+    on_change: true
+    email: <
+      recipients: "cr-fuchsia+bot@chromium.org"
+    >
+  >
+  builders: <
+    bucket: "ci-beta"
+    name: "Fuchsia x64"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  >
+>
+notifiers: <
+  notifications: <
+    on_change: true
+    email: <
+      recipients: "cronet-bots-observer@google.com"
+    >
+  >
+  builders: <
+    bucket: "ci-beta"
+    name: "android-cronet-arm-rel"
+    repository: "https://chromium.googlesource.com/chromium/src"
+  >
+>
+notifiers: <
+  notifications: <
+    on_change: true
+    email: <
+      recipients: "cronet-bots-observer@google.com"
+    >
+  >
+  builders: <
+    bucket: "ci-beta"
+    name: "android-cronet-kitkat-arm-rel"
+  >
+>
+notifiers: <
+  notifications: <
+    on_change: true
+    email: <
+      recipients: "cronet-bots-observer@google.com"
+    >
+  >
+  builders: <
+    bucket: "ci-beta"
+    name: "android-cronet-lollipop-arm-rel"
+  >
+>

infra/config/versioned/milestones.star

-beta = 'm80'
-stable = 'm79'
+beta = 'm81'
+stable = 'm80'

infra/config/versioned/milestones/m79/vars.star

-vars = struct(
-    ref = 'refs/branch-heads/3945',
-    cq_ref_regexp = 'refs/branch-heads/3945',
-)

infra/config/versioned/milestones/m79/buckets/ci.star → infra/config/versioned/milestones/m81/buckets/ci.star

@@ -40,6 +40,74 @@ ci.defaults.triggered_by.set([vars.poller.get()])
 # them, then lexicographically by their name
 
 
+ci.android_builder(
+    name = 'Android WebView L (dbg)',
+    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
+)
+
+ci.android_builder(
+    name = 'Android arm Builder (dbg)',
+    execution_timeout = 4 * time.hour,
+    triggered_by = [vars.poller.get()],
+)
+
+ci.android_builder(
+    name = 'Cast Android (dbg)',
+    triggered_by = [vars.poller.get()],
+)
+
+ci.android_builder(
+    name = 'KitKat Phone Tester (dbg)',
+    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
+)
+
+ci.android_builder(
+    name = 'KitKat Tablet Tester',
+    # We have limited tablet capacity and thus limited ability to run
+    # tests in parallel, hence the high timeout.
+    execution_timeout = 10 * time.hour,
+    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
+)
+
+ci.android_builder(
+    name = 'Lollipop Phone Tester',
+    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
+)
+
+ci.android_builder(
+    name = 'Lollipop Tablet Tester',
+    # We have limited tablet capacity and thus limited ability to run
+    # tests in parallel, hence the high timeout.
+    execution_timeout = 10 * time.hour,
+    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
+)
+
+ci.android_builder(
+    name = 'Marshmallow Tablet Tester',
+    # We have limited tablet capacity and thus limited ability to run
+    # tests in parallel, hence the high timeout.
+    execution_timeout = 8 * time.hour,
+    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
+)
+
+ci.android_builder(
+    name = 'android-cronet-arm-rel',
+    notifies = ['cronet'],
+    triggered_by = [vars.poller.get()],
+)
+
+ci.android_builder(
+    name = 'android-cronet-kitkat-arm-rel',
+    notifies = ['cronet'],
+    triggered_by = [vars.bucket.builder('android-cronet-arm-rel')],
+)
+
+ci.android_builder(
+    name = 'android-cronet-lollipop-arm-rel',
+    notifies = ['cronet'],
+    triggered_by = [vars.bucket.builder('android-cronet-arm-rel')],
+)
+
 ci.android_builder(
     name = 'android-kitkat-arm-rel',
 )
@@ -53,6 +121,16 @@ ci.chromiumos_builder(
     name = 'chromeos-amd64-generic-rel',
 )
 
+ci.chromiumos_builder(
+    name = 'chromeos-arm-generic-rel',
+    triggered_by = [vars.poller.get()],
+)
+
+ci.chromiumos_builder(
+    name = 'linux-chromeos-dbg',
+    triggered_by = [vars.poller.get()],
+)
+
 ci.chromiumos_builder(
     name = 'linux-chromeos-rel',
 )
@@ -117,6 +195,24 @@ ci.gpu_thin_tester(
 )
 
 
+ci.linux_builder(
+    name = 'Cast Linux',
+    goma_jobs = goma.jobs.J50,
+    triggered_by = [vars.poller.get()],
+)
+
+ci.linux_builder(
+    name = 'Fuchsia ARM64',
+    notifies = ['cr-fuchsia'],
+    triggered_by = [vars.poller.get()],
+)
+
+ci.linux_builder(
+    name = 'Fuchsia x64',
+    notifies = ['cr-fuchsia'],
+    triggered_by = [vars.poller.get()],
+)
+
 ci.linux_builder(
     name = 'Linux Builder',
 )
@@ -127,11 +223,22 @@ ci.linux_builder(
     triggered_by = [vars.bucket.builder('Linux Builder')],
 )
 
+ci.linux_builder(
+    name = 'linux-ozone-rel',
+    triggered_by = [vars.poller.get()],
+)
+
 
 ci.mac_builder(
     name = 'Mac Builder',
 )
 
+ci.mac_builder(
+    name = 'Mac Builder (dbg)',
+    os = os.MAC_ANY,
+    triggered_by = [vars.poller.get()],
+)
+
 # The build runs on 10.13, but triggers tests on 10.10 bots.
 ci.mac_builder(
     name = 'Mac10.10 Tests',
@@ -156,6 +263,12 @@ ci.mac_builder(
     triggered_by = [vars.bucket.builder('Mac Builder')],
 )
 
+ci.mac_builder(
+    name = 'Mac10.13 Tests (dbg)',
+    os = os.MAC_ANY,
+    triggered_by = [vars.bucket.builder('Mac Builder (dbg)')],
+)
+
 ci.mac_builder(
     name = 'WebKit Mac10.13 (retina)',
     os = os.MAC_10_13,
@@ -168,12 +281,42 @@ ci.mac_ios_builder(
 )
 
 
+ci.memory_builder(
+    name = 'Linux ASan LSan Builder',
+    ssd = True,
+    triggered_by = [vars.poller.get()],
+)
+
+ci.memory_builder(
+    name = 'Linux ASan LSan Tests (1)',
+    triggered_by = [vars.bucket.builder('Linux ASan LSan Builder')],
+)
+
+ci.memory_builder(
+    name = 'Linux ASan Tests (sandboxed)',
+    triggered_by = [vars.bucket.builder('Linux ASan LSan Builder')],
+)
+
+
+ci.win_builder(
+    name = 'Win7 Tests (dbg)(1)',
+    os = os.WINDOWS_7,
+    triggered_by = [vars.bucket.builder('Win Builder (dbg)')],
+)
+
 ci.win_builder(
     name = 'Win 7 Tests x64 (1)',
     os = os.WINDOWS_7,
     triggered_by = [vars.bucket.builder('Win x64 Builder')],
 )
 
+ci.win_builder(
+    name = 'Win Builder (dbg)',
+    cores = 32,
+    os = os.WINDOWS_ANY,
+    triggered_by = [vars.poller.get()],
+)
+
 ci.win_builder(
     name = 'Win x64 Builder',
     cores = 32,

infra/config/versioned/milestones/m79/buckets/try.star → infra/config/versioned/milestones/m81/buckets/try.star

@@ -63,13 +63,18 @@ try_.defaults.cq_group.set(vars.cq_group.get())
 # 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(
-        # TODO(https://crbug.com/1024641) Make non-experimental
-        experiment_percentage = 1,
-    ),
+    tryjob = try_.job(),
+    should_exonerate_flaky_failures = True,
 )
 
 try_.chromium_android_builder(
@@ -78,32 +83,54 @@ try_.chromium_android_builder(
     goma_jobs = goma.jobs.J300,
     ssd = True,
     use_java_coverage = True,
-    tryjob = try_.job(
-        # TODO(https://crbug.com/1024641) Make non-experimental
-        experiment_percentage = 1,
-    ),
+    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(
-        # TODO(https://crbug.com/1024641) Make non-experimental
-        experiment_percentage = 1,
-    ),
+    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(
-        # TODO(https://crbug.com/1024641) Make non-experimental
-        experiment_percentage = 1,
-    ),
+    tryjob = try_.job(),
     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',
@@ -117,48 +144,104 @@ try_.chromium_linux_builder(
     },
     tryjob = try_.job(
         disable_reuse = True,
-        # TODO(https://crbug.com/1024637) Make non-experimental
-        experiment_percentage = 100,
     ),
 )
 
+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(
-        # TODO(https://crbug.com/1024637) Make non-experimental
-        experiment_percentage = 1,
-    ),
+    tryjob = try_.job(),
     use_clang_coverage = True,
+    should_exonerate_flaky_failures = 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,
-    tryjob = try_.job(
-        # TODO(https://crbug.com/1024641) Make non-experimental
-        experiment_percentage = 1,
-    ),
+    tryjob = try_.job(),
+    should_exonerate_flaky_failures = True,
+)
+
+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',
-    tryjob = try_.job(
-        # TODO(https://crbug.com/1024641) Make non-experimental
-        experiment_percentage = 1,
-    ),
+    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(),
+)
+
+try_.chromium_win_builder(
+    name = 'win_chromium_compile_dbg_ng',
+    goma_jobs = goma.jobs.J150,
+    tryjob = try_.job(),
+)
+
 try_.chromium_win_builder(
     name = 'win10_chromium_x64_rel_ng',
     goma_jobs = goma.jobs.J150,
     os = os.WINDOWS_10,
     ssd = True,
-    tryjob = try_.job(
-        # TODO(https://crbug.com/1024641) Make non-experimental
-        experiment_percentage = 1,
-    ),
+    tryjob = try_.job(),
+    should_exonerate_flaky_failures = True,
 )

infra/config/versioned/milestones/m81/vars.star

+vars = struct(
+    ref = 'refs/branch-heads/4044',
+    cq_ref_regexp = 'refs/branch-heads/4044',
+)

infra/config/versioned/trunk/buckets/ci.star

@@ -40,6 +40,74 @@ ci.defaults.triggered_by.set([vars.poller.get()])
 # them, then lexicographically by their name
 
 
+ci.android_builder(
+    name = 'Android WebView L (dbg)',
+    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
+)
+
+ci.android_builder(
+    name = 'Android arm Builder (dbg)',
+    execution_timeout = 4 * time.hour,
+    triggered_by = [vars.poller.get()],
+)
+
+ci.android_builder(
+    name = 'Cast Android (dbg)',
+    triggered_by = [vars.poller.get()],
+)
+
+ci.android_builder(
+    name = 'KitKat Phone Tester (dbg)',
+    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
+)
+
+ci.android_builder(
+    name = 'KitKat Tablet Tester',
+    # We have limited tablet capacity and thus limited ability to run
+    # tests in parallel, hence the high timeout.
+    execution_timeout = 10 * time.hour,
+    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
+)
+
+ci.android_builder(
+    name = 'Lollipop Phone Tester',
+    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
+)
+
+ci.android_builder(
+    name = 'Lollipop Tablet Tester',
+    # We have limited tablet capacity and thus limited ability to run
+    # tests in parallel, hence the high timeout.
+    execution_timeout = 10 * time.hour,
+    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
+)
+
+ci.android_builder(
+    name = 'Marshmallow Tablet Tester',
+    # We have limited tablet capacity and thus limited ability to run
+    # tests in parallel, hence the high timeout.
+    execution_timeout = 8 * time.hour,
+    triggered_by = [vars.bucket.builder('Android arm Builder (dbg)')],
+)
+
+ci.android_builder(
+    name = 'android-cronet-arm-rel',
+    notifies = ['cronet'],
+    triggered_by = [vars.poller.get()],
+)
+
+ci.android_builder(
+    name = 'android-cronet-kitkat-arm-rel',
+    notifies = ['cronet'],
+    triggered_by = [vars.bucket.builder('android-cronet-arm-rel')],
+)
+
+ci.android_builder(
+    name = 'android-cronet-lollipop-arm-rel',
+    notifies = ['cronet'],
+    triggered_by = [vars.bucket.builder('android-cronet-arm-rel')],
+)
+
 ci.android_builder(
     name = 'android-kitkat-arm-rel',
 )
@@ -53,6 +121,16 @@ ci.chromiumos_builder(
     name = 'chromeos-amd64-generic-rel',
 )
 
+ci.chromiumos_builder(
+    name = 'chromeos-arm-generic-rel',
+    triggered_by = [vars.poller.get()],
+)
+
+ci.chromiumos_builder(
+    name = 'linux-chromeos-dbg',
+    triggered_by = [vars.poller.get()],
+)
+
 ci.chromiumos_builder(
     name = 'linux-chromeos-rel',
 )
@@ -117,6 +195,24 @@ ci.gpu_thin_tester(
 )
 
 
+ci.linux_builder(
+    name = 'Cast Linux',
+    goma_jobs = goma.jobs.J50,
+    triggered_by = [vars.poller.get()],
+)
+
+ci.linux_builder(
+    name = 'Fuchsia ARM64',
+    notifies = ['cr-fuchsia'],
+    triggered_by = [vars.poller.get()],
+)
+
+ci.linux_builder(
+    name = 'Fuchsia x64',
+    notifies = ['cr-fuchsia'],
+    triggered_by = [vars.poller.get()],
+)
+
 ci.linux_builder(
     name = 'Linux Builder',
 )
@@ -127,11 +223,22 @@ ci.linux_builder(
     triggered_by = [vars.bucket.builder('Linux Builder')],
 )
 
+ci.linux_builder(
+    name = 'linux-ozone-rel',
+    triggered_by = [vars.poller.get()],
+)
+
 
 ci.mac_builder(
     name = 'Mac Builder',
 )
 
+ci.mac_builder(
+    name = 'Mac Builder (dbg)',
+    os = os.MAC_ANY,
+    triggered_by = [vars.poller.get()],
+)
+
 # The build runs on 10.13, but triggers tests on 10.10 bots.
 ci.mac_builder(
     name = 'Mac10.10 Tests',
@@ -156,6 +263,12 @@ ci.mac_builder(
     triggered_by = [vars.bucket.builder('Mac Builder')],
 )
 
+ci.mac_builder(
+    name = 'Mac10.13 Tests (dbg)',
+    os = os.MAC_ANY,
+    triggered_by = [vars.bucket.builder('Mac Builder (dbg)')],
+)
+
 ci.mac_builder(
     name = 'WebKit Mac10.13 (retina)',
     os = os.MAC_10_13,
@@ -168,12 +281,42 @@ ci.mac_ios_builder(
 )
 
 
+ci.memory_builder(
+    name = 'Linux ASan LSan Builder',
+    ssd = True,
+    triggered_by = [vars.poller.get()],
+)
+
+ci.memory_builder(
+    name = 'Linux ASan LSan Tests (1)',
+    triggered_by = [vars.bucket.builder('Linux ASan LSan Builder')],
+)
+
+ci.memory_builder(
+    name = 'Linux ASan Tests (sandboxed)',
+    triggered_by = [vars.bucket.builder('Linux ASan LSan Builder')],
+)
+
+
+ci.win_builder(
+    name = 'Win7 Tests (dbg)(1)',
+    os = os.WINDOWS_7,
+    triggered_by = [vars.bucket.builder('Win Builder (dbg)')],
+)
+
 ci.win_builder(
     name = 'Win 7 Tests x64 (1)',
     os = os.WINDOWS_7,
     triggered_by = [vars.bucket.builder('Win x64 Builder')],
 )
 
+ci.win_builder(
+    name = 'Win Builder (dbg)',
+    cores = 32,
+    os = os.WINDOWS_ANY,
+    triggered_by = [vars.poller.get()],
+)
+
 ci.win_builder(
     name = 'Win x64 Builder',
     cores = 32,

infra/config/versioned/trunk/buckets/try.star

@@ -63,6 +63,13 @@ try_.defaults.cq_group.set(vars.cq_group.get())
 # 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,
@@ -79,12 +86,38 @@ try_.chromium_android_builder(
     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,
@@ -93,6 +126,11 @@ try_.chromium_chromiumos_builder(
 )
 
 
+try_.chromium_linux_builder(
+    name = 'cast_shell_linux',
+    tryjob = try_.job(),
+)
+
 try_.chromium_linux_builder(
     name = 'chromium_presubmit',
     executable = 'recipe:presubmit',
@@ -109,6 +147,27 @@ try_.chromium_linux_builder(
     ),
 )
 
+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,
@@ -117,6 +176,31 @@ try_.chromium_linux_builder(
     should_exonerate_flaky_failures = 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',
@@ -125,6 +209,13 @@ try_.chromium_mac_builder(
     should_exonerate_flaky_failures = True,
 )
 
+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',
@@ -132,6 +223,20 @@ try_.chromium_mac_ios_builder(
 )
 
 
+try_.chromium_win_builder(
+    name = 'win-libfuzzer-asan-rel',
+    builderless = False,
+    executable = 'recipe:chromium_libfuzzer_trybot',
+    os = os.WINDOWS_ANY,
+    tryjob = try_.job(),
+)
+
+try_.chromium_win_builder(
+    name = 'win_chromium_compile_dbg_ng',
+    goma_jobs = goma.jobs.J150,
+    tryjob = try_.job(),
+)
+
 try_.chromium_win_builder(
     name = 'win10_chromium_x64_rel_ng',
     goma_jobs = goma.jobs.J150,