Define the chromium.fuzz console entries at the builders.

The following changes were made to the console:
* The entry for 'ChromiumOS ASAN Release' had it's cro short name
replace with 'cros asan' category to be more consistent with other
entries in the console and preserve its position.

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

infra/config/buckets/ci.star

@@ -173,6 +173,38 @@ ci.console_view(
     },
 )
 
+ci.console_view(
+    name ='chromium.fuzz',
+    ordering = {
+        None: [
+            'afl',
+            'win asan',
+            'mac asan',
+            'cros asan',
+            'linux asan',
+            'libfuzz',
+            'linux msan',
+            'linux tsan',
+        ],
+        '*config*': ci.ordering(short_names=['dbg', 'rel']),
+        'win asan': '*config*',
+        'mac asan': '*config*',
+        'linux asan': '*config*',
+        'linux asan|x64 v8-ARM': '*config*',
+        'libfuzz': ci.ordering(short_names=[
+            'chromeos-asan',
+            'linux32',
+            'linux32-dbg',
+            'linux',
+            'linux-dbg',
+            'linux-msan',
+            'linux-ubsan',
+            'mac-asan',
+            'win-asan',
+        ]),
+    },
+)
+
 ci.console_view(
     name = 'chromium.gpu',
     ordering = {
@@ -1155,6 +1187,10 @@ ci.dawn_builder(
 
 ci.fuzz_builder(
     name = 'ASAN Debug',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux asan',
+        short_name = 'dbg',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 4,
     ),
@@ -1162,6 +1198,10 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = 'ASan Debug (32-bit x86 with V8-ARM)',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux asan|x64 v8-ARM',
+        short_name = 'dbg',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 4,
     ),
@@ -1169,6 +1209,10 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = 'ASAN Release',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux asan',
+        short_name = 'rel',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 5,
     ),
@@ -1176,6 +1220,10 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = 'ASan Release (32-bit x86 with V8-ARM)',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux asan|x64 v8-ARM',
+        short_name = 'rel',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 4,
     ),
@@ -1183,6 +1231,10 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = 'ASAN Release Media',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux asan',
+        short_name = 'med',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 4,
     ),
@@ -1190,6 +1242,10 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = 'Afl Upload Linux ASan',
+    console_view_entry = ci.console_view_entry(
+        category = 'afl',
+        short_name = 'afl',
+    ),
     executable = 'recipe:chromium_afl',
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 4,
@@ -1198,6 +1254,10 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = 'ASan Release Media (32-bit x86 with V8-ARM)',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux asan|x64 v8-ARM',
+        short_name = 'med',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 4,
     ),
@@ -1205,6 +1265,9 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = 'ChromiumOS ASAN Release',
+    console_view_entry = ci.console_view_entry(
+        category = 'cros asan',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 6,
     ),
@@ -1212,6 +1275,10 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = 'MSAN Release (chained origins)',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux msan',
+        short_name = 'org',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 4,
     ),
@@ -1219,6 +1286,10 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = 'MSAN Release (no origins)',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux msan',
+        short_name = 'rel',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 4,
     ),
@@ -1227,6 +1298,10 @@ ci.fuzz_builder(
 ci.fuzz_builder(
     name = 'Mac ASAN Release',
     builderless = False,
+    console_view_entry = ci.console_view_entry(
+        category = 'mac asan',
+        short_name = 'rel',
+    ),
     cores = 4,
     os = os.MAC_DEFAULT,
     triggering_policy = scheduler.greedy_batching(
@@ -1237,6 +1312,10 @@ ci.fuzz_builder(
 ci.fuzz_builder(
     name = 'Mac ASAN Release Media',
     builderless = False,
+    console_view_entry = ci.console_view_entry(
+        category = 'mac asan',
+        short_name = 'med',
+    ),
     cores = 4,
     os = os.MAC_DEFAULT,
     triggering_policy = scheduler.greedy_batching(
@@ -1246,6 +1325,10 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = 'TSAN Debug',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux tsan',
+        short_name = 'dbg',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 4,
     ),
@@ -1253,6 +1336,10 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = 'TSAN Release',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux tsan',
+        short_name = 'rel',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 3,
     ),
@@ -1260,6 +1347,10 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = 'UBSan Release',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux UBSan',
+        short_name = 'rel',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 4,
     ),
@@ -1267,6 +1358,10 @@ ci.fuzz_builder(
 
 ci.fuzz_builder(
     name = 'UBSan vptr Release',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux UBSan',
+        short_name = 'vpt',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 4,
     ),
@@ -1275,6 +1370,10 @@ ci.fuzz_builder(
 ci.fuzz_builder(
     name = 'Win ASan Release',
     builderless = False,
+    console_view_entry = ci.console_view_entry(
+        category = 'win asan',
+        short_name = 'rel',
+    ),
     os = os.WINDOWS_DEFAULT,
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 7,
@@ -1284,6 +1383,10 @@ ci.fuzz_builder(
 ci.fuzz_builder(
     name = 'Win ASan Release Media',
     builderless = False,
+    console_view_entry = ci.console_view_entry(
+        category = 'win asan',
+        short_name = 'med',
+    ),
     os = os.WINDOWS_DEFAULT,
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 6,
@@ -1293,6 +1396,10 @@ ci.fuzz_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = 'Libfuzzer Upload Chrome OS ASan',
+    console_view_entry = ci.console_view_entry(
+        category = 'libfuzz',
+        short_name = 'chromeos-asan',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 3,
     ),
@@ -1300,6 +1407,10 @@ ci.fuzz_libfuzzer_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = 'Libfuzzer Upload Linux ASan',
+    console_view_entry = ci.console_view_entry(
+        category = 'libfuzz',
+        short_name = 'linux',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 5,
     ),
@@ -1307,6 +1418,10 @@ ci.fuzz_libfuzzer_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = 'Libfuzzer Upload Linux ASan Debug',
+    console_view_entry = ci.console_view_entry(
+        category = 'libfuzz',
+        short_name = 'linux-dbg',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 5,
     ),
@@ -1314,6 +1429,10 @@ ci.fuzz_libfuzzer_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = 'Libfuzzer Upload Linux MSan',
+    console_view_entry = ci.console_view_entry(
+        category = 'libfuzz',
+        short_name = 'linux-msan',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 5,
     ),
@@ -1323,6 +1442,10 @@ ci.fuzz_libfuzzer_builder(
     name = 'Libfuzzer Upload Linux UBSan',
     # Do not use builderless for this (crbug.com/980080).
     builderless = False,
+    console_view_entry = ci.console_view_entry(
+        category = 'libfuzz',
+        short_name = 'linux-ubsan',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 5,
     ),
@@ -1330,6 +1453,10 @@ ci.fuzz_libfuzzer_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = 'Libfuzzer Upload Linux V8-ARM64 ASan',
+    console_view_entry = ci.console_view_entry(
+        category = 'libfuzz',
+        short_name = 'arm64',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 1,
     ),
@@ -1337,6 +1464,10 @@ ci.fuzz_libfuzzer_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = 'Libfuzzer Upload Linux V8-ARM64 ASan Debug',
+    console_view_entry = ci.console_view_entry(
+        category = 'libfuzz',
+        short_name = 'arm64-dbg',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 1,
     ),
@@ -1344,6 +1475,10 @@ ci.fuzz_libfuzzer_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = 'Libfuzzer Upload Linux32 ASan',
+    console_view_entry = ci.console_view_entry(
+        category = 'libfuzz',
+        short_name = 'linux32',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 3,
     ),
@@ -1351,6 +1486,10 @@ ci.fuzz_libfuzzer_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = 'Libfuzzer Upload Linux32 ASan Debug',
+    console_view_entry = ci.console_view_entry(
+        category = 'libfuzz',
+        short_name = 'linux32-dbg',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 3,
     ),
@@ -1358,6 +1497,10 @@ ci.fuzz_libfuzzer_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = 'Libfuzzer Upload Linux32 V8-ARM ASan',
+    console_view_entry = ci.console_view_entry(
+        category = 'libfuzz',
+        short_name = 'arm',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 1,
     ),
@@ -1365,6 +1508,10 @@ ci.fuzz_libfuzzer_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = 'Libfuzzer Upload Linux32 V8-ARM ASan Debug',
+    console_view_entry = ci.console_view_entry(
+        category = 'libfuzz',
+        short_name = 'arm-dbg',
+    ),
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 1,
     ),
@@ -1372,6 +1519,10 @@ ci.fuzz_libfuzzer_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = 'Libfuzzer Upload Mac ASan',
+    console_view_entry = ci.console_view_entry(
+        category = 'libfuzz',
+        short_name = 'mac-asan',
+    ),
     cores = 24,
     execution_timeout = 4 * time.hour,
     os = os.MAC_DEFAULT,
@@ -1379,6 +1530,10 @@ ci.fuzz_libfuzzer_builder(
 
 ci.fuzz_libfuzzer_builder(
     name = 'Libfuzzer Upload Windows ASan',
+    console_view_entry = ci.console_view_entry(
+        category = 'libfuzz',
+        short_name = 'win-asan',
+    ),
     os = os.WINDOWS_DEFAULT,
     triggering_policy = scheduler.greedy_batching(
         max_concurrent_invocations = 3,

infra/config/consoles/chromium.fuzz.star

@@ -1,161 +0,0 @@
-luci.console_view(
-    name = 'chromium.fuzz',
-    header = '//consoles/chromium-header.textpb',
-    repo = 'https://chromium.googlesource.com/chromium/src',
-    entries = [
-        luci.console_view_entry(
-            builder = 'ci/Afl Upload Linux ASan',
-            category = 'afl',
-            short_name = 'afl',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Win ASan Release',
-            category = 'win asan',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Win ASan Release Media',
-            category = 'win asan',
-            short_name = 'med',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Mac ASAN Release',
-            category = 'mac asan',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Mac ASAN Release Media',
-            category = 'mac asan',
-            short_name = 'med',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ChromiumOS ASAN Release',
-            short_name = 'cro',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ASAN Debug',
-            category = 'linux asan',
-            short_name = 'dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ASAN Release',
-            category = 'linux asan',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ASAN Release Media',
-            category = 'linux asan',
-            short_name = 'med',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ASan Debug (32-bit x86 with V8-ARM)',
-            category = 'linux asan|x64 v8-ARM',
-            short_name = 'dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ASan Release (32-bit x86 with V8-ARM)',
-            category = 'linux asan|x64 v8-ARM',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/ASan Release Media (32-bit x86 with V8-ARM)',
-            category = 'linux asan|x64 v8-ARM',
-            short_name = 'med',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Libfuzzer Upload Chrome OS ASan',
-            category = 'libfuzz',
-            short_name = 'chromeos-asan',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Libfuzzer Upload Linux32 ASan',
-            category = 'libfuzz',
-            short_name = 'linux32',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Libfuzzer Upload Linux32 ASan Debug',
-            category = 'libfuzz',
-            short_name = 'linux32-dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Libfuzzer Upload Linux ASan',
-            category = 'libfuzz',
-            short_name = 'linux',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Libfuzzer Upload Linux ASan Debug',
-            category = 'libfuzz',
-            short_name = 'linux-dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Libfuzzer Upload Linux MSan',
-            category = 'libfuzz',
-            short_name = 'linux-msan',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Libfuzzer Upload Linux UBSan',
-            category = 'libfuzz',
-            short_name = 'linux-ubsan',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Libfuzzer Upload Mac ASan',
-            category = 'libfuzz',
-            short_name = 'mac-asan',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Libfuzzer Upload Windows ASan',
-            category = 'libfuzz',
-            short_name = 'win-asan',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Libfuzzer Upload Linux32 V8-ARM ASan',
-            category = 'libfuzz',
-            short_name = 'arm',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Libfuzzer Upload Linux32 V8-ARM ASan Debug',
-            category = 'libfuzz',
-            short_name = 'arm-dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Libfuzzer Upload Linux V8-ARM64 ASan',
-            category = 'libfuzz',
-            short_name = 'arm64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Libfuzzer Upload Linux V8-ARM64 ASan Debug',
-            category = 'libfuzz',
-            short_name = 'arm64-dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/MSAN Release (chained origins)',
-            category = 'linux msan',
-            short_name = 'org',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/MSAN Release (no origins)',
-            category = 'linux msan',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/TSAN Debug',
-            category = 'linux tsan',
-            short_name = 'dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/TSAN Release',
-            category = 'linux tsan',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/UBSan Release',
-            category = 'linux UBSan',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/UBSan vptr Release',
-            category = 'linux UBSan',
-            short_name = 'vpt',
-        ),
-    ],
-)

infra/config/generated/luci-milo.cfg

@@ -2666,7 +2666,7 @@ consoles: <
   >
   builders: <
     name: "buildbucket/luci.chromium.ci/ChromiumOS ASAN Release"
-    short_name: "cro"
+    category: "cros asan"
   >
   builders: <
     name: "buildbucket/luci.chromium.ci/ASAN Debug"

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.fuzz.star')
 exec('//consoles/chromium.goma.star')
 exec('//consoles/chromium.goma.fyi.star')
 exec('//consoles/chromium.goma.migration.star')