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/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'),