Define the chromium.memory console entries at the builders.

Update the console sorting to allow for a category entry in the console
ordering dict to alias another entry.

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

infra/config/buckets/ci.star

@@ -73,6 +73,17 @@ ci.console_view(
     },
 )
 
+ci.console_view(
+    name = 'chromium.memory',
+    ordering = {
+        None: ['win', 'mac', 'linux', 'cros'],
+        '*build-or-test*': ci.ordering(short_names=['bld', 'tst']),
+        'linux|TSan v2': '*build-or-test*',
+        'linux|asan lsan': '*build-or-test*',
+        'linux|webkit': ci.ordering(short_names=['asn', 'msn']),
+    },
+)
+
 ci.console_view(
     name = 'chromium.win',
     ordering = {
@@ -1891,6 +1902,10 @@ ci.memory_builder(
 
 ci.memory_builder(
     name = 'Linux CFI',
+    console_view_entry = ci.console_view_entry(
+        category = 'cfi',
+        short_name = 'lnx',
+    ),
     cores = 32,
     # TODO(thakis): Remove once https://crbug.com/927738 is resolved.
     execution_timeout = 4 * time.hour,
@@ -1899,6 +1914,10 @@ ci.memory_builder(
 
 ci.memory_builder(
     name = 'Linux Chromium OS ASan LSan Builder',
+    console_view_entry = ci.console_view_entry(
+        category = 'cros|asan',
+        short_name = 'bld',
+    ),
     # TODO(crbug.com/1030593): Builds take more than 3 hours sometimes. Remove
     # once the builds are faster.
     execution_timeout = 6 * time.hour,
@@ -1906,31 +1925,55 @@ ci.memory_builder(
 
 ci.memory_builder(
     name = 'Linux Chromium OS ASan LSan Tests (1)',
+    console_view_entry = ci.console_view_entry(
+        category = 'cros|asan',
+        short_name = 'tst',
+    ),
     triggered_by = ['Linux Chromium OS ASan LSan Builder'],
 )
 
 ci.memory_builder(
     name = 'Linux ChromiumOS MSan Builder',
+    console_view_entry = ci.console_view_entry(
+        category = 'cros|msan',
+        short_name = 'bld',
+    ),
 )
 
 ci.memory_builder(
     name = 'Linux ChromiumOS MSan Tests',
+    console_view_entry = ci.console_view_entry(
+        category = 'cros|msan',
+        short_name = 'tst',
+    ),
     triggered_by = ['Linux ChromiumOS MSan Builder'],
 )
 
 ci.memory_builder(
     name = 'Linux MSan Builder',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux|msan',
+        short_name = 'bld',
+    ),
     goma_jobs = goma.jobs.MANY_JOBS_FOR_CI,
 )
 
 ci.memory_builder(
     name = 'Linux MSan Tests',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux|msan',
+        short_name = 'tst',
+    ),
     triggered_by = ['Linux MSan Builder'],
 )
 
 ci.memory_builder(
     name = 'Mac ASan 64 Builder',
     builderless = False,
+    console_view_entry = ci.console_view_entry(
+        category = 'mac',
+        short_name = 'bld',
+    ),
     goma_debug = True,  # TODO(hinoka): Remove this after debugging.
     goma_jobs = None,
     cores = None,  # Swapping between 8 and 24
@@ -1943,28 +1986,52 @@ ci.memory_builder(
 ci.memory_builder(
     name = 'Mac ASan 64 Tests (1)',
     builderless = False,
+    console_view_entry = ci.console_view_entry(
+        category = 'mac',
+        short_name = 'tst',
+    ),
     os = os.MAC_DEFAULT,
     triggered_by = ['Mac ASan 64 Builder'],
 )
 
 ci.memory_builder(
     name = 'WebKit Linux ASAN',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux|webkit',
+        short_name = 'asn',
+    ),
 )
 
 ci.memory_builder(
     name = 'WebKit Linux Leak',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux|webkit',
+        short_name = 'lk',
+    ),
 )
 
 ci.memory_builder(
     name = 'WebKit Linux MSAN',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux|webkit',
+        short_name = 'msn',
+    ),
 )
 
 ci.memory_builder(
     name = 'android-asan',
+    console_view_entry = ci.console_view_entry(
+        category = 'android',
+        short_name = 'asn',
+    ),
 )
 
 ci.memory_builder(
     name = 'win-asan',
+    console_view_entry = ci.console_view_entry(
+        category = 'win',
+        short_name = 'asn',
+    ),
     cores = 32,
     builderless = True,
     os = os.WINDOWS_DEFAULT,

infra/config/consoles/chromium.memory.star

-luci.console_view(
-    name = 'chromium.memory',
-    header = '//consoles/chromium-header.textpb',
-    repo = 'https://chromium.googlesource.com/chromium/src',
-    entries = [
-        luci.console_view_entry(
-            builder = 'ci/win-asan',
-            category = 'win',
-            short_name = 'asn',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Mac ASan 64 Builder',
-            category = 'mac',
-            short_name = 'bld',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Mac ASan 64 Tests (1)',
-            category = 'mac',
-            short_name = 'tst',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Linux TSan Builder',
-            category = 'linux|TSan v2',
-            short_name = 'bld',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Linux TSan Tests',
-            category = 'linux|TSan v2',
-            short_name = 'tst',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Linux ASan LSan Builder',
-            category = 'linux|asan lsan',
-            short_name = 'bld',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Linux ASan LSan Tests (1)',
-            category = 'linux|asan lsan',
-            short_name = 'tst',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Linux ASan Tests (sandboxed)',
-            category = 'linux|asan lsan',
-            short_name = 'sbx',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Linux MSan Builder',
-            category = 'linux|msan',
-            short_name = 'bld',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Linux MSan Tests',
-            category = 'linux|msan',
-            short_name = 'tst',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/WebKit Linux ASAN',
-            category = 'linux|webkit',
-            short_name = 'asn',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/WebKit Linux MSAN',
-            category = 'linux|webkit',
-            short_name = 'msn',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/WebKit Linux Leak',
-            category = 'linux|webkit',
-            short_name = 'lk',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Linux Chromium OS ASan LSan Builder',
-            category = 'cros|asan',
-            short_name = 'bld',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Linux Chromium OS ASan LSan Tests (1)',
-            category = 'cros|asan',
-            short_name = 'tst',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Linux ChromiumOS MSan Builder',
-            category = 'cros|msan',
-            short_name = 'bld',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Linux ChromiumOS MSan Tests',
-            category = 'cros|msan',
-            short_name = 'tst',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/android-asan',
-            category = 'android',
-            short_name = 'asn',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Linux CFI',
-            category = 'cfi',
-            short_name = 'lnx',
-        ),
-    ],
-)

infra/config/lib/ci.star

@@ -94,6 +94,8 @@ def _builder_sort_key(console_name, console_ordering, builder):
   short_name_key = ()
   if builder.short_name:
     ordering = console_ordering.get(category, [])
+    if type(ordering) == type(''):
+      ordering = console_ordering[ordering]
     short_name_ordering = getattr(ordering, 'short_names', [])
     short_name_key = _level_sort_key(builder.short_name, short_name_ordering)
 

infra/config/main.star

@@ -114,7 +114,6 @@ exec('//consoles/chromium.goma.fyi.star')
 exec('//consoles/chromium.goma.migration.star')
 exec('//consoles/chromium.gpu.star')
 exec('//consoles/chromium.gpu.fyi.star')
-exec('//consoles/chromium.memory.star')
 exec('//consoles/chromium.swangle.star')
 exec('//consoles/chromium.webrtc.star')
 exec('//consoles/chromium.webrtc.fyi.star')

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

@@ -641,25 +641,45 @@ ci.mac_ios_builder(
 
 ci.memory_builder(
     name = 'Linux ASan LSan Builder',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux|asan lsan',
+        short_name = 'bld',
+    ),
     ssd = True,
 )
 
 ci.memory_builder(
     name = 'Linux ASan LSan Tests (1)',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux|asan lsan',
+        short_name = 'tst',
+    ),
     triggered_by = [builder_name('Linux ASan LSan Builder')],
 )
 
 ci.memory_builder(
     name = 'Linux ASan Tests (sandboxed)',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux|asan lsan',
+        short_name = 'sbx',
+    ),
     triggered_by = [builder_name('Linux ASan LSan Builder')],
 )
 
 ci.memory_builder(
     name = 'Linux TSan Builder',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux|TSan v2',
+        short_name = 'bld',
+    ),
 )
 
 ci.memory_builder(
     name = 'Linux TSan Tests',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux|TSan v2',
+        short_name = 'tst',
+    ),
     triggered_by = [builder_name('Linux TSan Builder')],
 )