Define the chromium.fyi console entries at the builders.

The following changes were made to the console:
* The category for chromeos-kevin-rel-hw-tests was updated from chromos
to chromeos to match the other chromeos FYI builder.
* The builders in the linux category were moved before builders with
more deeply nested categories; less-nested builders always appear before
more-nested builders.

Bug: 1067057
Change-Id: I12c68275b9da6bcd308f2e3af543535016fb22fb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2140307
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: Aaron Gable <agable@chromium.org>
Cr-Commit-Position: refs/heads/master@{#757975}

infra/config/buckets/ci.star

@@ -71,6 +71,38 @@ ci.console_view(
     },
 )
 
+ci.console_view(
+    name = 'chromium.fyi',
+    ordering = {
+        None: [
+            'closure_compilation',
+            'code_coverage',
+            'cronet',
+            'mac',
+            'deterministic',
+            'fuchsia',
+            'chromeos',
+            'iOS',
+            'linux',
+            'mojo',
+            'recipe',
+            'remote_run',
+            'site_isolation',
+            'network',
+            'viz',
+            'win10',
+            'win32',
+        ],
+        'code_coverage': ci.ordering(
+            short_names=['and', 'ann', 'lnx', 'lcr', 'mac']
+        ),
+        'mac': ci.ordering(short_names=['bld', '15', 'herm']),
+        'deterministic|mac': ci.ordering(short_names=['rel', 'dbg']),
+        'iOS|iOS13': ci.ordering(short_names=['dev', 'sim']),
+        'linux|blink': ci.ordering(short_names=['TD']),
+    },
+)
+
 ci.console_view(
     name = 'chromium.gpu',
     ordering = {
@@ -1124,131 +1156,228 @@ ci.fuzz_libfuzzer_builder(
 
 ci.fyi_builder(
     name = 'Closure Compilation Linux',
+    console_view_entry = ci.console_view_entry(
+        category = 'closure_compilation',
+    ),
     executable = 'recipe:closure_compilation',
 )
 
 ci.fyi_builder(
     name = 'Linux Viz',
+    console_view_entry = ci.console_view_entry(
+        category = 'viz',
+    ),
 )
 
 ci.fyi_builder(
     name = 'Linux remote_run Builder',
+    console_view_entry = ci.console_view_entry(
+        category = 'remote_run',
+    ),
 )
 
 ci.fyi_builder(
     name = 'Linux remote_run Tester',
+    console_view_entry = ci.console_view_entry(
+        category = 'remote_run',
+    ),
     triggered_by = ['Linux remote_run Builder'],
 )
 
 ci.fyi_builder(
     name = 'Mojo Android',
+    console_view_entry = ci.console_view_entry(
+        category = 'mojo',
+        short_name = 'and',
+    ),
 )
 
 ci.fyi_builder(
     name = 'Mojo ChromiumOS',
+    console_view_entry = ci.console_view_entry(
+        category = 'mojo',
+        short_name = 'cr',
+    ),
 )
 
 ci.fyi_builder(
     name = 'Mojo Linux',
+    console_view_entry = ci.console_view_entry(
+        category = 'mojo',
+        short_name = 'lnx',
+    ),
 )
 
 ci.fyi_builder(
     name = 'Site Isolation Android',
+    console_view_entry = ci.console_view_entry(
+        category = 'site_isolation',
+    ),
 )
 
 ci.fyi_builder(
     name = 'android-mojo-webview-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'mojo',
+        short_name = 'aw',
+    ),
 )
 
 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',
+    ),
     notifies = ['cr-fuchsia'],
 )
 
 ci.fyi_builder(
     name = 'fuchsia-fyi-x64-dbg',
+    console_view_entry = ci.console_view_entry(
+        category = 'fuchsia',
+    ),
     notifies = ['cr-fuchsia'],
 )
 
 ci.fyi_builder(
     name = 'fuchsia-fyi-x64-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'fuchsia',
+    ),
     notifies = ['cr-fuchsia'],
 )
 
 ci.fyi_builder(
     name = 'linux-annotator-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'network|traffic|annotations',
+        short_name = 'lnx',
+    ),
 )
 
 ci.fyi_builder(
     name = 'linux-bfcache-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux',
+    ),
 )
 
 ci.fyi_builder(
     name = 'linux-blink-animation-use-time-delta',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux|blink',
+        short_name = 'TD',
+    ),
 )
 
 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',
+        short_name = 'CM',
+    ),
 )
 
 ci.fyi_builder(
     name = 'linux-blink-heap-verification',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux|blink',
+        short_name = 'VF',
+    ),
 )
 
 ci.fyi_builder(
     name = 'linux-chromium-tests-staging-builder',
+    console_view_entry = ci.console_view_entry(
+        category = 'recipe|staging|linux',
+        short_name = 'bld',
+    ),
 )
 
 ci.fyi_builder(
     name = 'linux-chromium-tests-staging-tests',
+    console_view_entry = ci.console_view_entry(
+        category = 'recipe|staging|linux',
+        short_name = 'tst',
+    ),
     triggered_by = ['linux-chromium-tests-staging-builder'],
 )
 
 ci.fyi_builder(
     name = 'linux-fieldtrial-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux',
+    ),
 )
 
 ci.fyi_builder(
     name = 'linux-wpt-fyi-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux',
+    ),
     experimental = True,
     goma_backend = None,
 )
 
 ci.fyi_builder(
     name = 'win-pixel-builder-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'win10',
+    ),
     os = os.WINDOWS_10,
 )
 
 ci.fyi_builder(
     name = 'win-pixel-tester-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'win10',
+    ),
     os = None,
     triggered_by = ['win-pixel-builder-rel'],
 )
 
 ci.fyi_builder(
     name = 'linux-upload-perfetto',
+    console_view_entry = ci.console_view_entry(
+        category = 'perfetto',
+        short_name = 'lnx',
+    ),
     os = os.LINUX_DEFAULT,
 )
 
 ci.fyi_builder(
-    builderless = True,
     name = 'mac-upload-perfetto',
+    builderless = True,
+    console_view_entry = ci.console_view_entry(
+        category = 'perfetto',
+        short_name = 'mac',
+    ),
     os = os.MAC_DEFAULT,
     schedule = 'with 3h interval',
     triggered_by = [],
 )
 
 ci.fyi_builder(
-    builderless = True,
     name = 'win-upload-perfetto',
+    builderless = True,
+    console_view_entry = ci.console_view_entry(
+        category = 'perfetto',
+        short_name = 'win',
+    ),
     os = os.WINDOWS_DEFAULT,
     schedule = 'with 3h interval',
     triggered_by = [],
@@ -1256,18 +1385,28 @@ ci.fyi_builder(
 
 ci.fyi_celab_builder(
     name = 'win-celab-builder-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'celab',
+    ),
     schedule = '0 0,6,12,18 * * *',
     triggered_by = [],
 )
 
 ci.fyi_celab_builder(
     name = 'win-celab-tester-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'celab',
+    ),
     triggered_by = ['win-celab-builder-rel'],
 )
 
 
 ci.fyi_coverage_builder(
     name = 'android-code-coverage',
+    console_view_entry = ci.console_view_entry(
+        category = 'code_coverage',
+        short_name = 'and',
+    ),
     use_java_coverage = True,
     schedule = 'triggered',
     triggered_by = [],
@@ -1275,12 +1414,20 @@ ci.fyi_coverage_builder(
 
 ci.fyi_coverage_builder(
     name = 'android-code-coverage-native',
+    console_view_entry = ci.console_view_entry(
+        category = 'code_coverage',
+        short_name = 'ann',
+    ),
     use_clang_coverage = True,
 )
 
 ci.fyi_coverage_builder(
     name = 'ios-simulator-code-coverage',
     caches = [xcode_cache.x11c29],
+    console_view_entry = ci.console_view_entry(
+        category = 'code_coverage',
+        short_name = 'ios',
+    ),
     cores = None,
     os = os.MAC_ANY,
     use_clang_coverage = True,
@@ -1292,6 +1439,10 @@ ci.fyi_coverage_builder(
 
 ci.fyi_coverage_builder(
     name = 'linux-chromeos-code-coverage',
+    console_view_entry = ci.console_view_entry(
+        category = 'code_coverage',
+        short_name = 'lcr',
+    ),
     use_clang_coverage = True,
     schedule = 'triggered',
     triggered_by = [],
@@ -1299,6 +1450,10 @@ ci.fyi_coverage_builder(
 
 ci.fyi_coverage_builder(
     name = 'linux-code-coverage',
+    console_view_entry = ci.console_view_entry(
+        category = 'code_coverage',
+        short_name = 'lnx',
+    ),
     use_clang_coverage = True,
     triggered_by = [],
 )
@@ -1306,6 +1461,10 @@ ci.fyi_coverage_builder(
 ci.fyi_coverage_builder(
     name = 'mac-code-coverage',
     builderless = True,
+    console_view_entry = ci.console_view_entry(
+        category = 'code_coverage',
+        short_name = 'mac',
+    ),
     cores = 24,
     os = os.MAC_ANY,
     use_clang_coverage = True,
@@ -1314,6 +1473,10 @@ ci.fyi_coverage_builder(
 ci.fyi_coverage_builder(
     name = 'win10-code-coverage',
     builderless = True,
+    console_view_entry = ci.console_view_entry(
+        category = 'code_coverage',
+        short_name = 'win',
+    ),
     os = os.WINDOWS_DEFAULT,
     use_clang_coverage = True,
 )
@@ -1321,6 +1484,10 @@ ci.fyi_coverage_builder(
 
 ci.fyi_ios_builder(
     name = 'ios-simulator-cr-recipe',
+    console_view_entry = ci.console_view_entry(
+        category = 'iOS',
+        short_name = 'chr',
+    ),
     executable = 'recipe:chromium',
     properties = {
         'xcode_build_version': '11a1027',
@@ -1330,6 +1497,10 @@ ci.fyi_ios_builder(
 ci.fyi_ios_builder(
     name = 'ios-webkit-tot',
     caches = [xcode_cache.x11c505wk],
+    console_view_entry = ci.console_view_entry(
+        category = 'iOS',
+        short_name = 'wk',
+    ),
     executable = 'recipe:chromium',
     properties = {
         'xcode_build_version': '11c505wk'
@@ -1340,6 +1511,10 @@ ci.fyi_ios_builder(
 
 ci.fyi_ios_builder(
     name = 'ios13-beta-simulator',
+    console_view_entry = ci.console_view_entry(
+        category = 'iOS|iOS13',
+        short_name = 'ios13',
+    ),
     executable = 'recipe:chromium',
     properties = {
         'xcode_build_version': '11c29',
@@ -1348,6 +1523,10 @@ ci.fyi_ios_builder(
 
 ci.fyi_ios_builder(
     name = 'ios13-sdk-device',
+    console_view_entry = ci.console_view_entry(
+        category = 'iOS|iOS13',
+        short_name = 'dev',
+    ),
     executable = 'recipe:chromium',
     properties = {
         'xcode_build_version': '11c29',
@@ -1356,6 +1535,10 @@ ci.fyi_ios_builder(
 
 ci.fyi_ios_builder(
     name = 'ios13-sdk-simulator',
+    console_view_entry = ci.console_view_entry(
+        category = 'iOS|iOS13',
+        short_name = 'sim',
+    ),
     executable = 'recipe:chromium',
     properties = {
         'xcode_build_version': '11c29'
@@ -1365,12 +1548,20 @@ ci.fyi_ios_builder(
 
 ci.fyi_mac_builder(
     name = 'Mac Builder Next',
+    console_view_entry = ci.console_view_entry(
+        category = 'mac',
+        short_name = 'bld',
+    ),
     cores = None,
     os = None,
 )
 
 ci.fyi_mac_builder(
     name = 'Mac10.15 Tests',
+    console_view_entry = ci.console_view_entry(
+        category = 'mac',
+        short_name = '15',
+    ),
     cores = None,
     os = os.MAC_10_15,
     triggered_by = ['Mac Builder Next'],
@@ -1378,6 +1569,10 @@ ci.fyi_mac_builder(
 
 ci.fyi_mac_builder(
     name = 'Mac deterministic',
+    console_view_entry = ci.console_view_entry(
+        category = 'deterministic|mac',
+        short_name = 'rel',
+    ),
     cores = None,
     executable = 'recipe:swarming/deterministic_build',
     execution_timeout = 6 * time.hour,
@@ -1385,6 +1580,10 @@ ci.fyi_mac_builder(
 
 ci.fyi_mac_builder(
     name = 'Mac deterministic (dbg)',
+    console_view_entry = ci.console_view_entry(
+        category = 'deterministic|mac',
+        short_name = 'dbg',
+    ),
     cores = None,
     executable = 'recipe:swarming/deterministic_build',
     execution_timeout = 6 * time.hour,
@@ -1392,22 +1591,36 @@ ci.fyi_mac_builder(
 
 ci.fyi_mac_builder(
     name = 'mac-hermetic-upgrade-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'mac',
+        short_name = 'herm',
+    ),
     cores = 8,
 )
 
 ci.fyi_mac_builder(
     name = 'mac-mojo-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'mojo',
+        short_name = 'mac',
+    ),
     os = os.MAC_ANY,
 )
 
 
 ci.fyi_windows_builder(
     name = 'Win 10 Fast Ring',
+    console_view_entry = ci.console_view_entry(
+        category = 'win10',
+    ),
     os = os.WINDOWS_10,
 )
 
 ci.fyi_windows_builder(
     name = 'win32-arm64-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'win32|arm64',
+    ),
     cpu = cpu.X86,
     goma_jobs = goma.jobs.J150,
 )
@@ -1415,11 +1628,19 @@ ci.fyi_windows_builder(
 ci.fyi_windows_builder(
     name = 'win-annotator-rel',
     builderless = True,
+    console_view_entry = ci.console_view_entry(
+        category = 'network|traffic|annotations',
+        short_name = 'win',
+    ),
     execution_timeout = 16 * time.hour,
 )
 
 ci.fyi_windows_builder(
     name = 'Mojo Windows',
+    console_view_entry = ci.console_view_entry(
+        category = 'mojo',
+        short_name = 'win',
+    ),
 )
 
 
@@ -1913,6 +2134,11 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = 'Leak Detection Linux',
+    console_view = 'chromium.fyi',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux',
+        short_name = 'lk',
+    ),
 )
 
 ci.linux_builder(

infra/config/generated/luci-milo.cfg

@@ -3156,7 +3156,7 @@ consoles: <
   >
   builders: <
     name: "buildbucket/luci.chromium.ci/chromeos-kevin-rel-hw-tests"
-    category: "chromos"
+    category: "chromeos"
   >
   builders: <
     name: "buildbucket/luci.chromium.ci/ios-simulator-cr-recipe"
@@ -3183,21 +3183,6 @@ consoles: <
     category: "iOS|iOS13"
     short_name: "ios13"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/linux-blink-animation-use-time-delta"
-    category: "linux|blink"
-    short_name: "TD"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/linux-blink-heap-concurrent-marking-tsan-rel"
-    category: "linux|blink"
-    short_name: "CM"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/linux-blink-heap-verification"
-    category: "linux|blink"
-    short_name: "VF"
-  >
   builders: <
     name: "buildbucket/luci.chromium.ci/VR Linux"
     category: "linux"
@@ -3238,6 +3223,21 @@ consoles: <
     category: "linux"
     short_name: "lox"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/linux-blink-animation-use-time-delta"
+    category: "linux|blink"
+    short_name: "TD"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/linux-blink-heap-concurrent-marking-tsan-rel"
+    category: "linux|blink"
+    short_name: "CM"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/linux-blink-heap-verification"
+    category: "linux|blink"
+    short_name: "VF"
+  >
   builders: <
     name: "buildbucket/luci.chromium.ci/Mojo Android"
     category: "mojo"
@@ -11030,7 +11030,7 @@ consoles: <
   >
   builders: <
     name: "buildbucket/luci.chromium.ci/chromeos-kevin-rel-hw-tests"
-    category: "chromium.fyi|chromos"
+    category: "chromium.fyi|chromeos"
   >
   builders: <
     name: "buildbucket/luci.chromium.ci/VR Linux"

infra/config/main.star

@@ -107,7 +107,6 @@ exec('//consoles/angle.try.star')
 exec('//consoles/chromium.android.fyi.star')
 exec('//consoles/chromium.clang.star')
 exec('//consoles/chromium.fuzz.star')
-exec('//consoles/chromium.fyi.star')
 exec('//consoles/chromium.goma.star')
 exec('//consoles/chromium.goma.fyi.star')
 exec('//consoles/chromium.goma.migration.star')

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

@@ -253,6 +253,9 @@ ci.chromiumos_builder(
 
 ci.fyi_builder(
     name = 'chromeos-kevin-rel-hw-tests',
+    console_view_entry = ci.console_view_entry(
+        category = 'chromeos',
+    ),
 )
 
 ci.chromiumos_builder(
@@ -402,12 +405,19 @@ ci.dawn_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(
     name = 'mac-osxbeta-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'mac',
+        short_name = 'beta',
+    ),
     goma_backend = None,
     triggered_by = [builder_name('Mac Builder')],
 )
@@ -415,6 +425,9 @@ 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 = {
@@ -425,6 +438,9 @@ ci.fyi_ios_builder(
 
 ci.fyi_windows_builder(
     name = 'Win10 Tests x64 1803',
+    console_view_entry = ci.console_view_entry(
+        category = 'win10|1803',
+    ),
     goma_backend = None,
     os = os.WINDOWS_10,
     triggered_by = [builder_name('Win x64 Builder')],
@@ -586,16 +602,31 @@ ci.linux_builder(
 
 ci.linux_builder(
     name = 'Linux Ozone Tester (Headless)',
+    console_view = 'chromium.fyi',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux',
+        short_name = 'loh',
+    ),
     triggered_by = [builder_name('linux-ozone-rel')],
 )
 
 ci.linux_builder(
     name = 'Linux Ozone Tester (Wayland)',
+    console_view = 'chromium.fyi',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux',
+        short_name = 'low',
+    ),
     triggered_by = [builder_name('linux-ozone-rel')],
 )
 
 ci.linux_builder(
     name = 'Linux Ozone Tester (X11)',
+    console_view = 'chromium.fyi',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux',
+        short_name = 'lox',
+    ),
     triggered_by = [builder_name('linux-ozone-rel')],
 )
 

infra/config/versioned/trunk/consoles/main.star

@@ -499,7 +499,7 @@ luci.console_view(
         ),
         luci.console_view_entry(
             builder = builder_name('chromeos-kevin-rel-hw-tests'),
-            category = 'chromium.fyi|chromos',
+            category = 'chromium.fyi|chromeos',
         ),
         luci.console_view_entry(
             builder = builder_name('VR Linux'),