Define the chromium.clang console entries at the builders.

The following changes were made to the console:
* Builders with no category were moved to the beginning of the console;
builders with no category always appear before builders with a category.
* Builders in the ToT Windows category were moved before builders with
more deeply nested categories; less-nested builders always appear before
more-nested builders.

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

infra/config/buckets/ci.star

@@ -61,6 +61,69 @@ ci.console_view(
     },
 )
 
+ci.console_view(
+    name = 'chromium.clang',
+    ordering = {
+        None: [
+            'ToT Linux',
+            'ToT Android',
+            'ToT Mac',
+            'ToT Windows',
+            'ToT Code Coverage',
+        ],
+        'ToT Linux': ci.ordering(
+            short_names=['rel', 'ofi', 'dbg', 'asn', 'fuz', 'msn', 'tsn'],
+        ),
+        'ToT Android': ci.ordering(short_names=['rel', 'dbg', 'x64']),
+        'ToT Mac': ci.ordering(short_names=['rel', 'ofi', 'dbg']),
+        'ToT Windows': ci.ordering(
+            short_names=['rel', 'ofi'],
+            categories=['x64'],
+        ),
+        'ToT Windows|x64': ci.ordering(short_names=['rel']),
+        'CFI|Win': ci.ordering(short_names=['x86', 'x64']),
+        'iOS': ['public'],
+        'iOS|public': ci.ordering(short_names=['sim', 'dev']),
+    },
+    entries = [
+        luci.console_view_entry(
+            builder = 'chrome:ci/ToTLinuxOfficial',
+            category = 'ToT Linux',
+            short_name = 'ofi',
+        ),
+        luci.console_view_entry(
+            builder = 'chrome:ci/ToTMacOfficial',
+            category = 'ToT Mac',
+            short_name = 'ofi',
+        ),
+        luci.console_view_entry(
+            builder = 'chrome:ci/ToTWin',
+            category = 'ToT Windows',
+            short_name = 'rel',
+        ),
+        luci.console_view_entry(
+            builder = 'chrome:ci/ToTWin64',
+            category = 'ToT Windows|x64',
+            short_name = 'rel',
+        ),
+        luci.console_view_entry(
+            builder = 'chrome:ci/ToTWinOfficial',
+            category = 'ToT Windows',
+            short_name = 'ofi',
+        ),
+        luci.console_view_entry(
+            builder = 'chrome:ci/ToTWinThinLTO64',
+            category = 'ToT Windows|x64',
+            short_name = 'lto',
+        ),
+        luci.console_view_entry(
+            builder = 'chrome:ci/clang-tot-device',
+            category = 'iOS|internal',
+            short_name = 'dev',
+        ),
+    ],
+)
+
 ci.console_view(
     name = 'chromium.dawn',
     ordering = {
@@ -657,134 +720,253 @@ ci.chromiumos_builder(
 ci.clang_builder(
     name = 'CFI Linux CF',
     goma_backend = goma.backend.RBE_PROD,
+    console_view_entry = ci.console_view_entry(
+        category = 'CFI|Linux',
+        short_name = 'CF',
+    ),
 )
 
 ci.clang_builder(
     name = 'CFI Linux ToT',
+    console_view_entry = ci.console_view_entry(
+        category = 'CFI|Linux',
+        short_name = 'ToT',
+    ),
 )
 
 ci.clang_builder(
     name = 'CrWinAsan',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Windows|Asan',
+        short_name = 'asn',
+    ),
     os = os.WINDOWS_ANY,
 )
 
 ci.clang_builder(
     name = 'CrWinAsan(dll)',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Windows|Asan',
+        short_name = 'dll',
+    ),
     os = os.WINDOWS_ANY,
 )
 
 ci.clang_builder(
     name = 'ToTAndroid',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Android',
+        short_name = 'rel',
+    ),
 )
 
 ci.clang_builder(
     name = 'ToTAndroid (dbg)',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Android',
+        short_name = 'dbg',
+    ),
 )
 
 ci.clang_builder(
     name = 'ToTAndroid x64',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Android',
+        short_name = 'x64',
+    ),
 )
 
 ci.clang_builder(
     name = 'ToTAndroid64',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Android',
+        short_name = 'a64',
+    ),
 )
 
 ci.clang_builder(
     name = 'ToTAndroidASan',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Android',
+        short_name = 'asn',
+    ),
 )
 
 ci.clang_builder(
     name = 'ToTAndroidCFI',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Android',
+        short_name = 'cfi',
+    ),
 )
 
 ci.clang_builder(
     name = 'ToTAndroidOfficial',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Android',
+        short_name = 'off',
+    ),
 )
 
 ci.clang_builder(
     name = 'ToTLinux',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Linux',
+        short_name = 'rel',
+    ),
 )
 
 ci.clang_builder(
     name = 'ToTLinux (dbg)',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Linux',
+        short_name = 'dbg',
+    ),
 )
 
 ci.clang_builder(
     name = 'ToTLinuxASan',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Linux',
+        short_name = 'asn',
+    ),
 )
 
 ci.clang_builder(
     name = 'ToTLinuxASanLibfuzzer',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Linux',
+        short_name = 'fuz',
+    ),
 )
 
 ci.clang_builder(
     name = 'ToTLinuxCoverage',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Code Coverage',
+        short_name = 'linux',
+    ),
     executable = 'recipe:chromium_clang_coverage_tot',
 )
 
 ci.clang_builder(
     name = 'ToTLinuxMSan',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Linux',
+        short_name = 'msn',
+    ),
 )
 
 ci.clang_builder(
     name = 'ToTLinuxTSan',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Linux',
+        short_name = 'tsn',
+    ),
 )
 
 ci.clang_builder(
     name = 'ToTLinuxThinLTO',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Linux',
+        short_name = 'lto',
+    ),
 )
 
 ci.clang_builder(
     name = 'ToTLinuxUBSanVptr',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Linux',
+        short_name = 'usn',
+    ),
 )
 
 ci.clang_builder(
     name = 'ToTWin(dbg)',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Windows',
+        short_name = 'dbg',
+    ),
     os = os.WINDOWS_ANY,
 )
 
 ci.clang_builder(
     name = 'ToTWin(dll)',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Windows',
+        short_name = 'dll',
+    ),
     os = os.WINDOWS_ANY,
 )
 
 ci.clang_builder(
     name = 'ToTWin64(dbg)',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Windows|x64',
+        short_name = 'dbg',
+    ),
     os = os.WINDOWS_ANY,
 )
 
 ci.clang_builder(
     name = 'ToTWin64(dll)',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Windows|x64',
+        short_name = 'dll',
+    ),
     os = os.WINDOWS_ANY,
 )
 
 ci.clang_builder(
     name = 'ToTWinASanLibfuzzer',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Windows|Asan',
+        short_name = 'fuz',
+    ),
     os = os.WINDOWS_ANY,
 )
 
 ci.clang_builder(
     name = 'ToTWinCFI',
+    console_view_entry = ci.console_view_entry(
+        category = 'CFI|Win',
+        short_name = 'x86',
+    ),
     os = os.WINDOWS_ANY,
 )
 
 ci.clang_builder(
     name = 'ToTWinCFI64',
+    console_view_entry = ci.console_view_entry(
+        category = 'CFI|Win',
+        short_name = 'x64',
+    ),
     os = os.WINDOWS_ANY,
 )
 
 ci.clang_builder(
     name = 'UBSanVptr Linux',
+    console_view_entry = ci.console_view_entry(
+        short_name = 'usn',
+    ),
     goma_backend = goma.backend.RBE_PROD,
 )
 
 ci.clang_builder(
     name = 'linux-win_cross-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Windows',
+        short_name = 'lxw',
+    ),
 )
 
 ci.clang_builder(
     name = 'ToTiOS',
     caches = [xcode_cache.x11c29],
+    console_view_entry = ci.console_view_entry(
+        category = 'iOS|public',
+        short_name = 'sim',
+    ),
     cores = None,
     os = os.MAC_10_14,
     properties = {
@@ -796,6 +978,10 @@ ci.clang_builder(
 ci.clang_builder(
     name = 'ToTiOSDevice',
     caches = [xcode_cache.x11c29],
+    console_view_entry = ci.console_view_entry(
+        category = 'iOS|public',
+        short_name = 'dev',
+    ),
     cores = None,
     os = os.MAC_10_14,
     properties = {
@@ -807,18 +993,34 @@ ci.clang_builder(
 
 ci.clang_mac_builder(
     name = 'ToTMac',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Mac',
+        short_name = 'rel',
+    ),
 )
 
 ci.clang_mac_builder(
     name = 'ToTMac (dbg)',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Mac',
+        short_name = 'dbg',
+    ),
 )
 
 ci.clang_mac_builder(
     name = 'ToTMacASan',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Mac',
+        short_name = 'asn',
+    ),
 )
 
 ci.clang_mac_builder(
     name = 'ToTMacCoverage',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT Code Coverage',
+        short_name = 'mac',
+    ),
     executable = 'recipe:chromium_clang_coverage_tot',
 )
 

infra/config/consoles/chromium.clang.star

-luci.console_view(
-    name = 'chromium.clang',
-    header = '//consoles/chromium-header.textpb',
-    repo = 'https://chromium.googlesource.com/chromium/src',
-    entries = [
-        luci.console_view_entry(
-            builder = 'ci/ToTLinux',
-            category = 'ToT Linux',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'chrome:ci/ToTLinuxOfficial',
-            category = 'ToT Linux',
-            short_name = 'ofi',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTLinux (dbg)',
-            category = 'ToT Linux',
-            short_name = 'dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTLinuxASan',
-            category = 'ToT Linux',
-            short_name = 'asn',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTLinuxASanLibfuzzer',
-            category = 'ToT Linux',
-            short_name = 'fuz',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTLinuxMSan',
-            category = 'ToT Linux',
-            short_name = 'msn',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTLinuxTSan',
-            category = 'ToT Linux',
-            short_name = 'tsn',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTLinuxThinLTO',
-            category = 'ToT Linux',
-            short_name = 'lto',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTLinuxUBSanVptr',
-            category = 'ToT Linux',
-            short_name = 'usn',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTAndroid',
-            category = 'ToT Android',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTAndroid (dbg)',
-            category = 'ToT Android',
-            short_name = 'dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTAndroid x64',
-            category = 'ToT Android',
-            short_name = 'x64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTAndroid64',
-            category = 'ToT Android',
-            short_name = 'a64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTAndroidASan',
-            category = 'ToT Android',
-            short_name = 'asn',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTAndroidCFI',
-            category = 'ToT Android',
-            short_name = 'cfi',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTAndroidOfficial',
-            category = 'ToT Android',
-            short_name = 'off',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTMac',
-            category = 'ToT Mac',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'chrome:ci/ToTMacOfficial',
-            category = 'ToT Mac',
-            short_name = 'ofi',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTMac (dbg)',
-            category = 'ToT Mac',
-            short_name = 'dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTMacASan',
-            category = 'ToT Mac',
-            short_name = 'asn',
-        ),
-        luci.console_view_entry(
-            builder = 'chrome:ci/ToTWin',
-            category = 'ToT Windows',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'chrome:ci/ToTWinOfficial',
-            category = 'ToT Windows',
-            short_name = 'ofi',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTWin(dbg)',
-            category = 'ToT Windows',
-            short_name = 'dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTWin(dll)',
-            category = 'ToT Windows',
-            short_name = 'dll',
-        ),
-        luci.console_view_entry(
-            builder = 'chrome:ci/ToTWin64',
-            category = 'ToT Windows|x64',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTWin64(dbg)',
-            category = 'ToT Windows|x64',
-            short_name = 'dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTWin64(dll)',
-            category = 'ToT Windows|x64',
-            short_name = 'dll',
-        ),
-        luci.console_view_entry(
-            builder = 'chrome:ci/ToTWinThinLTO64',
-            category = 'ToT Windows|x64',
-            short_name = 'lto',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/CrWinAsan',
-            category = 'ToT Windows|Asan',
-            short_name = 'asn',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/CrWinAsan(dll)',
-            category = 'ToT Windows|Asan',
-            short_name = 'dll',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTWinASanLibfuzzer',
-            category = 'ToT Windows|Asan',
-            short_name = 'fuz',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/linux-win_cross-rel',
-            category = 'ToT Windows',
-            short_name = 'lxw',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTLinuxCoverage',
-            category = 'ToT Code Coverage',
-            short_name = 'linux',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTMacCoverage',
-            category = 'ToT Code Coverage',
-            short_name = 'mac',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/CFI Linux CF',
-            category = 'CFI|Linux',
-            short_name = 'CF',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/CFI Linux ToT',
-            category = 'CFI|Linux',
-            short_name = 'ToT',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTWinCFI',
-            category = 'CFI|Win',
-            short_name = 'x86',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTWinCFI64',
-            category = 'CFI|Win',
-            short_name = 'x64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTiOS',
-            category = 'iOS|public',
-            short_name = 'sim',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ToTiOSDevice',
-            category = 'iOS|public',
-            short_name = 'dev',
-        ),
-        luci.console_view_entry(
-            builder = 'chrome:ci/clang-tot-device',
-            category = 'iOS|internal',
-            short_name = 'dev',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/UBSanVptr Linux',
-            short_name = 'usn',
-        ),
-    ],
-)

infra/config/generated/luci-milo.cfg

@@ -1766,6 +1766,10 @@ consoles: <
   repo_url: "https://chromium.googlesource.com/chromium/src"
   refs: "regexp:refs/heads/master"
   manifest_name: "REVISION"
+  builders: <
+    name: "buildbucket/luci.chromium.ci/UBSanVptr Linux"
+    short_name: "usn"
+  >
   builders: <
     name: "buildbucket/luci.chromium.ci/ToTLinux"
     category: "ToT Linux"
@@ -1886,6 +1890,11 @@ consoles: <
     category: "ToT Windows"
     short_name: "dll"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/linux-win_cross-rel"
+    category: "ToT Windows"
+    short_name: "lxw"
+  >
   builders: <
     name: "buildbucket/luci.chrome.ci/ToTWin64"
     category: "ToT Windows|x64"
@@ -1921,11 +1930,6 @@ consoles: <
     category: "ToT Windows|Asan"
     short_name: "fuz"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/linux-win_cross-rel"
-    category: "ToT Windows"
-    short_name: "lxw"
-  >
   builders: <
     name: "buildbucket/luci.chromium.ci/ToTLinuxCoverage"
     category: "ToT Code Coverage"
@@ -1971,10 +1975,6 @@ consoles: <
     category: "iOS|internal"
     short_name: "dev"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/UBSanVptr Linux"
-    short_name: "usn"
-  >
   header: <
     oncalls: <
       name: "Chromium"

infra/config/main.star

@@ -104,7 +104,6 @@ exec('//buckets/webrtc.fyi.star')
 
 exec('//consoles/android.packager.star')
 exec('//consoles/angle.try.star')
-exec('//consoles/chromium.clang.star')
 exec('//consoles/chromium.fuzz.star')
 exec('//consoles/chromium.goma.star')
 exec('//consoles/chromium.goma.fyi.star')