Define the chromium.android console entries at the builders.

The following changes were made to the console:
* android-lollipop-arm-rel had its category changed to on_cq to match
android-lollipop-arm-rel and android-marshamallow-arm64-rel.
* The on_cq builders for the different android versions were grouped
together before other on_cq builders.

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

infra/config/buckets/ci.star

@@ -32,6 +32,19 @@ ci.console_view(
     ordering = {},
 )
 
+ci.console_view(
+    name = 'chromium.android',
+    ordering = {
+        None: ['cronet', 'builder', 'tester'],
+        '*cpu*': ['arm', 'arm64', 'x86'],
+        'cronet': '*cpu*',
+        'builder': '*cpu*',
+        'builder|det': ci.ordering(short_names=['rel', 'dbg']),
+        'tester': ['phone', 'tablet'],
+        'builder_tester|arm64': ci.ordering(short_names=['M proguard']),
+    },
+)
+
 ci.console_view(
     name = 'chromium.chromiumos',
     ordering = {
@@ -179,32 +192,56 @@ ci.builder(
 
 ci.android_builder(
     name = 'Android ASAN (dbg)',
+    console_view_entry = ci.console_view_entry(
+        category = 'on_cq',
+        short_name = 'san',
+    ),
 )
 
 ci.android_builder(
     name = 'Android WebView L (dbg)',
+    console_view_entry = ci.console_view_entry(
+        category = 'tester|webview',
+        short_name = 'L',
+    ),
     triggered_by = ['ci/Android arm Builder (dbg)'],
 )
 
 ci.android_builder(
     name = 'Deterministic Android',
+    console_view_entry = ci.console_view_entry(
+        category = 'builder|det',
+        short_name = 'rel',
+    ),
     executable = 'recipe:swarming/deterministic_build',
     execution_timeout = 6 * time.hour,
 )
 
 ci.android_builder(
     name = 'Deterministic Android (dbg)',
+    console_view_entry = ci.console_view_entry(
+        category = 'builder|det',
+        short_name = 'dbg',
+    ),
     executable = 'recipe:swarming/deterministic_build',
     execution_timeout = 6 * time.hour,
 )
 
 ci.android_builder(
     name = 'KitKat Phone Tester (dbg)',
+    console_view_entry = ci.console_view_entry(
+        category = 'tester|phone',
+        short_name = 'K',
+    ),
     triggered_by = ['ci/Android arm Builder (dbg)'],
 )
 
 ci.android_builder(
     name = 'KitKat Tablet Tester',
+    console_view_entry = ci.console_view_entry(
+        category = 'tester|tablet',
+        short_name = 'K',
+    ),
     # We have limited tablet capacity and thus limited ability to run
     # tests in parallel, hence the high timeout.
     execution_timeout = 20 * time.hour,
@@ -213,6 +250,10 @@ ci.android_builder(
 
 ci.android_builder(
     name = 'Lollipop Phone Tester',
+    console_view_entry = ci.console_view_entry(
+        category = 'tester|phone',
+        short_name = 'L',
+    ),
     # We have limited phone capacity and thus limited ability to run
     # tests in parallel, hence the high timeout.
     execution_timeout = 6 * time.hour,
@@ -221,6 +262,10 @@ ci.android_builder(
 
 ci.android_builder(
     name = 'Lollipop Tablet Tester',
+    console_view_entry = ci.console_view_entry(
+        category = 'tester|tablet',
+        short_name = 'L',
+    ),
     # We have limited tablet capacity and thus limited ability to run
     # tests in parallel, hence the high timeout.
     execution_timeout = 20 * time.hour,
@@ -229,6 +274,10 @@ ci.android_builder(
 
 ci.android_builder(
     name = 'Marshmallow Tablet Tester',
+    console_view_entry = ci.console_view_entry(
+        category = 'tester|tablet',
+        short_name = 'M',
+    ),
     # We have limited tablet capacity and thus limited ability to run
     # tests in parallel, hence the high timeout.
     execution_timeout = 12 * time.hour,
@@ -237,28 +286,47 @@ ci.android_builder(
 
 ci.android_builder(
     name = 'android-arm64-proguard-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'builder_tester|arm64',
+        short_name = 'M proguard',
+    ),
     goma_jobs = goma.jobs.MANY_JOBS_FOR_CI,
     execution_timeout = 6 * time.hour,
 )
 
 ci.android_builder(
     name = 'android-cronet-arm64-dbg',
+    console_view_entry = ci.console_view_entry(
+        category = 'cronet|arm64',
+        short_name = 'dbg',
+    ),
     notifies = ['cronet'],
 )
 
 ci.android_builder(
     name = 'android-cronet-arm64-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'cronet|arm64',
+        short_name = 'rel',
+    ),
     notifies = ['cronet'],
 )
 
 ci.android_builder(
     name = 'android-cronet-asan-arm-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'cronet|asan',
+    ),
     notifies = ['cronet'],
 )
 
 # Runs on a specific machine with an attached phone
 ci.android_builder(
     name = 'android-cronet-marshmallow-arm64-perf-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'cronet|test|perf',
+        short_name = 'm',
+    ),
     cores = None,
     cpu = None,
     executable = 'recipe:cronet',
@@ -268,34 +336,61 @@ ci.android_builder(
 
 ci.android_builder(
     name = 'android-cronet-marshmallow-arm64-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'cronet|test',
+        short_name = 'm',
+    ),
     notifies = ['cronet'],
     triggered_by = ['android-cronet-arm64-rel'],
 )
 
 ci.android_builder(
     name = 'android-cronet-x86-dbg',
+    console_view_entry = ci.console_view_entry(
+        category = 'cronet|x86',
+        short_name = 'dbg',
+    ),
     notifies = ['cronet'],
 )
 
 ci.android_builder(
     name = 'android-cronet-x86-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'cronet|x86',
+        short_name = 'rel',
+    ),
     notifies = ['cronet'],
 )
 
 ci.android_builder(
     name = 'android-incremental-dbg',
+    console_view_entry = ci.console_view_entry(
+        category = 'tester|incremental',
+    ),
 )
 
 ci.android_builder(
     name = 'android-lollipop-arm-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'on_cq',
+        short_name = 'L',
+    ),
 )
 
 ci.android_builder(
     name = 'android-pie-x86-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'builder_tester|x86',
+        short_name = 'P',
+    ),
 )
 
 ci.android_builder(
     name = 'android-10-arm64-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'builder_tester|arm64',
+        short_name = '10',
+    ),
 )
 
 

infra/config/consoles/chromium.android.star

-luci.console_view(
-    name = 'chromium.android',
-    header = '//consoles/chromium-header.textpb',
-    repo = 'https://chromium.googlesource.com/chromium/src',
-    entries = [
-        luci.console_view_entry(
-            builder = 'ci/android-cronet-arm-dbg',
-            category = 'cronet|arm',
-            short_name = 'dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/android-cronet-arm-rel',
-            category = 'cronet|arm',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/android-cronet-arm64-dbg',
-            category = 'cronet|arm64',
-            short_name = 'dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/android-cronet-arm64-rel',
-            category = 'cronet|arm64',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/android-cronet-x86-dbg',
-            category = 'cronet|x86',
-            short_name = 'dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/android-cronet-x86-rel',
-            category = 'cronet|x86',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/android-cronet-asan-arm-rel',
-            category = 'cronet|asan',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/android-cronet-kitkat-arm-rel',
-            category = 'cronet|test',
-            short_name = 'k',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/android-cronet-lollipop-arm-rel',
-            category = 'cronet|test',
-            short_name = 'l',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/android-cronet-marshmallow-arm64-rel',
-            category = 'cronet|test',
-            short_name = 'm',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/android-cronet-marshmallow-arm64-perf-rel',
-            category = 'cronet|test|perf',
-            short_name = 'm',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Android arm Builder (dbg)',
-            category = 'builder|arm',
-            short_name = '32',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Android arm64 Builder (dbg)',
-            category = 'builder|arm',
-            short_name = '64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Android x86 Builder (dbg)',
-            category = 'builder|x86',
-            short_name = '32',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Android x64 Builder (dbg)',
-            category = 'builder|x86',
-            short_name = '64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Deterministic Android',
-            category = 'builder|det',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Deterministic Android (dbg)',
-            category = 'builder|det',
-            short_name = 'dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/KitKat Phone Tester (dbg)',
-            category = 'tester|phone',
-            short_name = 'K',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Lollipop Phone Tester',
-            category = 'tester|phone',
-            short_name = 'L',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/android-lollipop-arm-rel',
-            category = 'tester|phone|rel',
-            short_name = 'L',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Marshmallow 64 bit Tester',
-            category = 'tester|phone',
-            short_name = 'M',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Nougat Phone Tester',
-            category = 'tester|phone',
-            short_name = 'N',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Oreo Phone Tester',
-            category = 'tester|phone',
-            short_name = 'O',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/android-pie-arm64-dbg',
-            category = 'tester|phone',
-            short_name = 'P',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/KitKat Tablet Tester',
-            category = 'tester|tablet',
-            short_name = 'K',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Lollipop Tablet Tester',
-            category = 'tester|tablet',
-            short_name = 'L',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Marshmallow Tablet Tester',
-            category = 'tester|tablet',
-            short_name = 'M',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/android-incremental-dbg',
-            category = 'tester|incremental',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Android WebView L (dbg)',
-            category = 'tester|webview',
-            short_name = 'L',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Android WebView M (dbg)',
-            category = 'tester|webview',
-            short_name = 'M',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Android WebView N (dbg)',
-            category = 'tester|webview',
-            short_name = 'N',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Android WebView O (dbg)',
-            category = 'tester|webview',
-            short_name = 'O',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Android WebView P (dbg)',
-            category = 'tester|webview',
-            short_name = 'P',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/android-arm64-proguard-rel',
-            category = 'builder_tester|arm64',
-            short_name = 'M proguard',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/android-10-arm64-rel',
-            category = 'builder_tester|arm64',
-            short_name = '10',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/android-pie-x86-rel',
-            category = 'builder_tester|x86',
-            short_name = 'P',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/android-kitkat-arm-rel',
-            category = 'on_cq',
-            short_name = 'K',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/android-marshmallow-arm64-rel',
-            category = 'on_cq',
-            short_name = 'M',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Cast Android (dbg)',
-            category = 'on_cq',
-            short_name = 'cst',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Android ASAN (dbg)',
-            category = 'on_cq',
-            short_name = 'san',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/android-pie-arm64-rel',
-            category = 'on_cq',
-            short_name = 'P',
-        ),
-    ],
-)

infra/config/generated/luci-milo.cfg

@@ -757,11 +757,6 @@ consoles: <
     category: "tester|phone"
     short_name: "L"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/android-lollipop-arm-rel"
-    category: "tester|phone|rel"
-    short_name: "L"
-  >
   builders: <
     name: "buildbucket/luci.chromium.ci/Marshmallow 64 bit Tester"
     category: "tester|phone"
@@ -846,11 +841,21 @@ consoles: <
     category: "on_cq"
     short_name: "K"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/android-lollipop-arm-rel"
+    category: "on_cq"
+    short_name: "L"
+  >
   builders: <
     name: "buildbucket/luci.chromium.ci/android-marshmallow-arm64-rel"
     category: "on_cq"
     short_name: "M"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/android-pie-arm64-rel"
+    category: "on_cq"
+    short_name: "P"
+  >
   builders: <
     name: "buildbucket/luci.chromium.ci/Cast Android (dbg)"
     category: "on_cq"
@@ -861,11 +866,6 @@ consoles: <
     category: "on_cq"
     short_name: "san"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/android-pie-arm64-rel"
-    category: "on_cq"
-    short_name: "P"
-  >
   header: <
     oncalls: <
       name: "Chromium"
@@ -10873,14 +10873,14 @@ consoles: <
     short_name: "M"
   >
   builders: <
-    name: "buildbucket/luci.chromium.ci/Cast Android (dbg)"
+    name: "buildbucket/luci.chromium.ci/android-pie-arm64-rel"
     category: "chromium.android|on_cq"
-    short_name: "cst"
+    short_name: "P"
   >
   builders: <
-    name: "buildbucket/luci.chromium.ci/android-pie-arm64-rel"
+    name: "buildbucket/luci.chromium.ci/Cast Android (dbg)"
     category: "chromium.android|on_cq"
-    short_name: "P"
+    short_name: "cst"
   >
   builders: <
     name: "buildbucket/luci.chrome.ci/linux-chromeos-chrome"

infra/config/lib/ci.star

@@ -84,6 +84,8 @@ def _builder_sort_key(console_name, console_ordering, builder):
   if builder.category:
     for c in builder.category.split('|'):
       ordering = console_ordering.get(category, [])
+      if type(ordering) == type(''):
+        ordering = console_ordering[ordering]
       if type(ordering) == type(struct()):
         ordering = ordering.categories
       category_key.append(_level_sort_key(c, ordering))
@@ -154,7 +156,8 @@ def console_view(*, name, ordering=None, **kwargs):
           the short names of builders that have no category.
       2.  str: Category string to apply the ordering to the next nested
           level of categories and/or the short names of builders with
-          that category.
+          that category. Arbitrary strings can be used also, which can
+          be used as aliases for other entries to refer to.
 
       The value for each entry defines the ordering to be applied to
       builders that have matched the sequence of category components
@@ -163,6 +166,9 @@ def console_view(*, name, ordering=None, **kwargs):
           details.
       2.  list of category components: Equivalent to a `ci.ordering`
           call that only specifies `categories` with the given list.
+      3.  str: An alias for another category. The string must be another
+          key in the dict. The ordering will be looked up by that key
+          instead.
     kwargs - Additional keyword arguments to forward on to
       `luci.console_view`. The header and repo arguments support
        module-level defaults.

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.android.star')
 exec('//consoles/chromium.android.fyi.star')
 exec('//consoles/chromium.clang.star')
 exec('//consoles/chromium.dawn.star')

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

@@ -42,100 +42,180 @@ ci.defaults.triggered_by.set([vars.ci_poller])
 
 ci.android_builder(
     name = 'Android WebView M (dbg)',
+    console_view_entry = ci.console_view_entry(
+        category = 'tester|webview',
+        short_name = 'M',
+    ),
     triggered_by = [builder_name('Android arm64 Builder (dbg)')],
 )
 
 ci.android_builder(
     name = 'Android WebView N (dbg)',
+    console_view_entry = ci.console_view_entry(
+        category = 'tester|webview',
+        short_name = 'N',
+    ),
     triggered_by = [builder_name('Android arm64 Builder (dbg)')],
 )
 
 ci.android_builder(
     name = 'Android WebView O (dbg)',
+    console_view_entry = ci.console_view_entry(
+        category = 'tester|webview',
+        short_name = 'O',
+    ),
     triggered_by = [builder_name('Android arm64 Builder (dbg)')],
 )
 
 ci.android_builder(
     name = 'Android WebView P (dbg)',
+    console_view_entry = ci.console_view_entry(
+        category = 'tester|webview',
+        short_name = 'P',
+    ),
     triggered_by = [builder_name('Android arm64 Builder (dbg)')],
 )
 
 ci.android_builder(
     name = 'Android arm Builder (dbg)',
+    console_view_entry = ci.console_view_entry(
+        category = 'builder|arm',
+        short_name = '32',
+    ),
     execution_timeout = 4 * time.hour,
 )
 
 ci.android_builder(
     name = 'Android arm64 Builder (dbg)',
+    console_view_entry = ci.console_view_entry(
+        category = 'builder|arm',
+        short_name = '64',
+    ),
     goma_jobs = goma.jobs.MANY_JOBS_FOR_CI,
     execution_timeout = 4 * time.hour,
 )
 
 ci.android_builder(
     name = 'Android x64 Builder (dbg)',
+    console_view_entry = ci.console_view_entry(
+        category = 'builder|x86',
+        short_name = '64',
+    ),
     execution_timeout = 4 * time.hour,
 )
 
 ci.android_builder(
     name = 'Android x86 Builder (dbg)',
+    console_view_entry = ci.console_view_entry(
+        category = 'builder|x86',
+        short_name = '32',
+    ),
 )
 
 ci.android_builder(
     name = 'Cast Android (dbg)',
+    console_view_entry = ci.console_view_entry(
+        category = 'on_cq',
+        short_name = 'cst',
+    ),
 )
 
 ci.android_builder(
     name = 'Marshmallow 64 bit Tester',
+    console_view_entry = ci.console_view_entry(
+        category = 'tester|phone',
+        short_name = 'M',
+    ),
     triggered_by = [builder_name('Android arm64 Builder (dbg)')],
 )
 
 ci.android_builder(
     name = 'Nougat Phone Tester',
+    console_view_entry = ci.console_view_entry(
+        category = 'tester|phone',
+        short_name = 'N',
+    ),
     triggered_by = [builder_name('Android arm64 Builder (dbg)')],
 )
 
 ci.android_builder(
     name = 'Oreo Phone Tester',
+    console_view_entry = ci.console_view_entry(
+        category = 'tester|phone',
+        short_name = 'O',
+    ),
     triggered_by = [builder_name('Android arm64 Builder (dbg)')],
 )
 
 ci.android_builder(
     name = 'android-cronet-arm-dbg',
+    console_view_entry = ci.console_view_entry(
+        category = 'cronet|arm',
+        short_name = 'dbg',
+    ),
     notifies = ['cronet'],
 )
 
 ci.android_builder(
     name = 'android-cronet-arm-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'cronet|arm',
+        short_name = 'rel',
+    ),
     notifies = ['cronet'],
 )
 
 ci.android_builder(
     name = 'android-cronet-kitkat-arm-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'cronet|test',
+        short_name = 'k',
+    ),
     notifies = ['cronet'],
     triggered_by = [builder_name('android-cronet-arm-rel')],
 )
 
 ci.android_builder(
     name = 'android-cronet-lollipop-arm-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'cronet|test',
+        short_name = 'l',
+    ),
     notifies = ['cronet'],
     triggered_by = [builder_name('android-cronet-arm-rel')],
 )
 
 ci.android_builder(
     name = 'android-kitkat-arm-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'on_cq',
+        short_name = 'K',
+    ),
 )
 
 ci.android_builder(
     name = 'android-marshmallow-arm64-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'on_cq',
+        short_name = 'M',
+    ),
 )
 
 ci.android_builder(
     name = 'android-pie-arm64-dbg',
+    console_view_entry = ci.console_view_entry(
+        category = 'tester|phone',
+        short_name = 'P',
+    ),
     triggered_by = [builder_name('Android arm64 Builder (dbg)')],
 )
 
 ci.android_builder(
     name = 'android-pie-arm64-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'on_cq',
+        short_name = 'P',
+    ),
 )
 
 

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

@@ -340,14 +340,14 @@ luci.console_view(
             short_name = 'M',
         ),
         luci.console_view_entry(
-            builder = builder_name('Cast Android (dbg)'),
+            builder = builder_name('android-pie-arm64-rel'),
             category = 'chromium.android|on_cq',
-            short_name = 'cst',
+            short_name = 'P',
         ),
         luci.console_view_entry(
-            builder = builder_name('android-pie-arm64-rel'),
+            builder = builder_name('Cast Android (dbg)'),
             category = 'chromium.android|on_cq',
-            short_name = 'P',
+            short_name = 'cst',
         ),
         luci.console_view_entry(
             builder = 'chrome:ci/linux-chromeos-chrome',