Define the chromium.chromiumos console entries at the builders.

The following changes were made to the console ordering:
* The builders in the simple release category were moved before builders
with more deeply nested categories; less-nested builders always appear
before more-nested builders.
* The builders in the simple debug category were move after builders in
the simple release category; categories cannot be intermixed.

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

infra/config/buckets/ci.star

@@ -32,6 +32,15 @@ ci.console_view(
     ordering = {},
 )
 
+ci.console_view(
+    name = 'chromium.chromiumos',
+    ordering = {
+        None: ['default'],
+        'default': ci.ordering(short_names=['ful', 'rel']),
+        'simple': ['release', 'debug'],
+    },
+)
+
 ci.console_view(
     name = 'chromium.linux',
     ordering = {
@@ -422,18 +431,34 @@ ci.chromium_builder(
 
 ci.chromiumos_builder(
     name = 'Linux ChromiumOS Full',
+    console_view_entry = ci.console_view_entry(
+        category = 'default',
+        short_name = 'ful',
+    ),
 )
 
 ci.chromiumos_builder(
     name = 'chromeos-amd64-generic-asan-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'simple|release|x64',
+        short_name = 'asn',
+    ),
 )
 
 ci.chromiumos_builder(
     name = 'chromeos-amd64-generic-cfi-thin-lto-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'simple|release|x64',
+        short_name = 'cfi',
+    ),
 )
 
 ci.chromiumos_builder(
     name = 'chromeos-arm-generic-dbg',
+    console_view_entry = ci.console_view_entry(
+        category = 'simple|debug',
+        short_name = 'arm',
+    ),
 )
 
 

infra/config/consoles/chromium.chromiumos.star

-luci.console_view(
-    name = 'chromium.chromiumos',
-    header = '//consoles/chromium-header.textpb',
-    repo = 'https://chromium.googlesource.com/chromium/src',
-    entries = [
-        luci.console_view_entry(
-            builder = 'ci/Linux ChromiumOS Full',
-            category = 'default',
-            short_name = 'ful',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/linux-chromeos-rel',
-            category = 'default',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/linux-chromeos-dbg',
-            category = 'default',
-            short_name = 'dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/chromeos-amd64-generic-asan-rel',
-            category = 'simple|release|x64',
-            short_name = 'asn',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/chromeos-amd64-generic-cfi-thin-lto-rel',
-            category = 'simple|release|x64',
-            short_name = 'cfi',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/chromeos-amd64-generic-dbg',
-            category = 'simple|debug|x64',
-            short_name = 'dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/chromeos-amd64-generic-rel',
-            category = 'simple|release|x64',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/chromeos-arm-generic-dbg',
-            category = 'simple|debug',
-            short_name = 'arm',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/chromeos-arm-generic-rel',
-            category = 'simple|release',
-            short_name = 'arm',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/chromeos-kevin-rel',
-            category = 'simple|release',
-            short_name = 'kvn',
-        ),
-    ],
-)

infra/config/generated/luci-milo.cfg

@@ -1459,6 +1459,16 @@ consoles: <
     category: "default"
     short_name: "dbg"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/chromeos-arm-generic-rel"
+    category: "simple|release"
+    short_name: "arm"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/chromeos-kevin-rel"
+    category: "simple|release"
+    short_name: "kvn"
+  >
   builders: <
     name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-asan-rel"
     category: "simple|release|x64"
@@ -1469,11 +1479,6 @@ consoles: <
     category: "simple|release|x64"
     short_name: "cfi"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-dbg"
-    category: "simple|debug|x64"
-    short_name: "dbg"
-  >
   builders: <
     name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-rel"
     category: "simple|release|x64"
@@ -1485,14 +1490,9 @@ consoles: <
     short_name: "arm"
   >
   builders: <
-    name: "buildbucket/luci.chromium.ci/chromeos-arm-generic-rel"
-    category: "simple|release"
-    short_name: "arm"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/chromeos-kevin-rel"
-    category: "simple|release"
-    short_name: "kvn"
+    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-dbg"
+    category: "simple|debug|x64"
+    short_name: "dbg"
   >
   header: <
     oncalls: <
@@ -10732,16 +10732,6 @@ consoles: <
     category: "chromium.chromiumos|default"
     short_name: "dbg"
   >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-dbg"
-    category: "chromium.chromiumos|simple|debug|x64"
-    short_name: "dbg"
-  >
-  builders: <
-    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-rel"
-    category: "chromium.chromiumos|simple|release|x64"
-    short_name: "rel"
-  >
   builders: <
     name: "buildbucket/luci.chromium.ci/chromeos-arm-generic-rel"
     category: "chromium.chromiumos|simple|release"
@@ -10752,6 +10742,16 @@ consoles: <
     category: "chromium.chromiumos|simple|release"
     short_name: "kvn"
   >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-rel"
+    category: "chromium.chromiumos|simple|release|x64"
+    short_name: "rel"
+  >
+  builders: <
+    name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-dbg"
+    category: "chromium.chromiumos|simple|debug|x64"
+    short_name: "dbg"
+  >
   builders: <
     name: "buildbucket/luci.chromium.ci/android-cronet-arm-dbg"
     category: "chromium.android|cronet|arm"

infra/config/main.star

@@ -106,7 +106,6 @@ exec('//consoles/android.packager.star')
 exec('//consoles/angle.try.star')
 exec('//consoles/chromium.android.star')
 exec('//consoles/chromium.android.fyi.star')
-exec('//consoles/chromium.chromiumos.star')
 exec('//consoles/chromium.clang.star')
 exec('//consoles/chromium.dawn.star')
 exec('//consoles/chromium.fuzz.star')

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

@@ -141,18 +141,34 @@ ci.android_builder(
 
 ci.chromiumos_builder(
     name = 'chromeos-amd64-generic-dbg',
+    console_view_entry = ci.console_view_entry(
+        category = 'simple|debug|x64',
+        short_name = 'dbg',
+    ),
 )
 
 ci.chromiumos_builder(
     name = 'chromeos-amd64-generic-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'simple|release|x64',
+        short_name = 'rel',
+    ),
 )
 
 ci.chromiumos_builder(
     name = 'chromeos-arm-generic-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'simple|release',
+        short_name = 'arm',
+    ),
 )
 
 ci.chromiumos_builder(
     name = 'chromeos-kevin-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'simple|release',
+        short_name = 'kvn',
+    ),
 )
 
 ci.fyi_builder(
@@ -161,10 +177,18 @@ ci.fyi_builder(
 
 ci.chromiumos_builder(
     name = 'linux-chromeos-dbg',
+    console_view_entry = ci.console_view_entry(
+        category = 'default',
+        short_name = 'dbg',
+    ),
 )
 
 ci.chromiumos_builder(
     name = 'linux-chromeos-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'default',
+        short_name = 'rel',
+    ),
 )
 
 

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

@@ -199,16 +199,6 @@ luci.console_view(
             category = 'chromium.chromiumos|default',
             short_name = 'dbg',
         ),
-        luci.console_view_entry(
-            builder = builder_name('chromeos-amd64-generic-dbg'),
-            category = 'chromium.chromiumos|simple|debug|x64',
-            short_name = 'dbg',
-        ),
-        luci.console_view_entry(
-            builder = builder_name('chromeos-amd64-generic-rel'),
-            category = 'chromium.chromiumos|simple|release|x64',
-            short_name = 'rel',
-        ),
         luci.console_view_entry(
             builder = builder_name('chromeos-arm-generic-rel'),
             category = 'chromium.chromiumos|simple|release',
@@ -219,6 +209,16 @@ luci.console_view(
             category = 'chromium.chromiumos|simple|release',
             short_name = 'kvn',
         ),
+        luci.console_view_entry(
+            builder = builder_name('chromeos-amd64-generic-rel'),
+            category = 'chromium.chromiumos|simple|release|x64',
+            short_name = 'rel',
+        ),
+        luci.console_view_entry(
+            builder = builder_name('chromeos-amd64-generic-dbg'),
+            category = 'chromium.chromiumos|simple|debug|x64',
+            short_name = 'dbg',
+        ),
         luci.console_view_entry(
             builder = builder_name('android-cronet-arm-dbg'),
             category = 'chromium.android|cronet|arm',