Define the chromium console entries at the builders.

The following changes were made to the console ordering:
* The windows debug category appear before the windows release category,
which matches the order for the other OS categories in the console.

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

infra/config/buckets/ci.star

@@ -9,7 +9,9 @@ ci.defaults.cores.set(8)
 ci.defaults.cpu.set(cpu.X86_64)
 ci.defaults.executable.set('recipe:chromium')
 ci.defaults.execution_timeout.set(3 * time.hour)
+ci.defaults.header.set('//consoles/chromium-header.textpb')
 ci.defaults.os.set(os.LINUX_DEFAULT)
+ci.defaults.repo.set('https://chromium.googlesource.com/chromium/src')
 ci.defaults.service_account.set(
     'chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com')
 ci.defaults.swarming_tags.set(['vpython:native-python-wrapper'])
@@ -24,10 +26,14 @@ exec('//versioned/milestones/m83/buckets/ci.star')
 
 
 # *** After this point everything is trunk only ***
+ci.console_view(
+    name = 'chromium',
+    include_experimental_builds = True,
+    ordering = {},
+)
+
 ci.console_view(
     name = 'chromium.win',
-    header = '//consoles/chromium-header.textpb',
-    repo = 'https://chromium.googlesource.com/chromium/src',
     ordering = {
         None: ['release', 'debug'],
         'debug|builder': ci.ordering(short_names=['64', '32']),
@@ -295,30 +301,51 @@ ci.android_fyi_builder(
 )
 
 
+
 ci.chromium_builder(
     name = 'android-archive-dbg',
     # Bump to 32 if needed.
+    console_view_entry = ci.console_view_entry(
+        category = 'android',
+        short_name = 'dbg',
+    ),
     cores = 8,
 )
 
 ci.chromium_builder(
     name = 'android-archive-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'android',
+        short_name = 'rel',
+    ),
     cores = 32,
 )
 
 ci.chromium_builder(
     name = 'linux-archive-dbg',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux',
+        short_name = 'dbg',
+    ),
     # Bump to 32 if needed.
     cores = 8,
 )
 
 ci.chromium_builder(
     name = 'linux-archive-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'linux',
+        short_name = 'rel',
+    ),
     cores = 32,
 )
 
 ci.chromium_builder(
     name = 'mac-archive-dbg',
+    console_view_entry = ci.console_view_entry(
+        category = 'mac',
+        short_name = 'dbg',
+    ),
     # Bump to 8 cores if needed.
     cores = 4,
     os = os.MAC_DEFAULT,
@@ -326,29 +353,49 @@ ci.chromium_builder(
 
 ci.chromium_builder(
     name = 'mac-archive-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'mac',
+        short_name = 'rel',
+    ),
     os = os.MAC_DEFAULT,
 )
 
 ci.chromium_builder(
     name = 'win-archive-dbg',
+    console_view_entry = ci.console_view_entry(
+        category = 'win|dbg',
+        short_name = '64',
+    ),
     cores = 32,
     os = os.WINDOWS_DEFAULT,
 )
 
 ci.chromium_builder(
     name = 'win-archive-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'win|rel',
+        short_name = '64',
+    ),
     cores = 32,
     os = os.WINDOWS_DEFAULT,
 )
 
 ci.chromium_builder(
     name = 'win32-archive-dbg',
+    console_view_entry = ci.console_view_entry(
+        category = 'win|dbg',
+        short_name = '32',
+    ),
     cores = 32,
     os = os.WINDOWS_DEFAULT,
 )
 
 ci.chromium_builder(
     name = 'win32-archive-rel',
+    console_view_entry = ci.console_view_entry(
+        category = 'win|rel',
+        short_name = '32',
+    ),
     cores = 32,
     os = os.WINDOWS_DEFAULT,
 )

infra/config/consoles/chromium.star

-luci.console_view(
-    name = 'chromium',
-    header = '//consoles/chromium-header.textpb',
-    include_experimental_builds = True,
-    repo = 'https://chromium.googlesource.com/chromium/src',
-    entries = [
-        luci.console_view_entry(
-            builder = 'ci/android-archive-dbg',
-            category = 'android',
-            short_name = 'dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/android-archive-rel',
-            category = 'android',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/linux-archive-dbg',
-            category = 'linux',
-            short_name = 'dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/linux-archive-rel',
-            category = 'linux',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/mac-archive-dbg',
-            category = 'mac',
-            short_name = 'dbg',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/mac-archive-rel',
-            category = 'mac',
-            short_name = 'rel',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/win32-archive-rel',
-            category = 'win|rel',
-            short_name = '32',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/win-archive-rel',
-            category = 'win|rel',
-            short_name = '64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/win32-archive-dbg',
-            category = 'win|dbg',
-            short_name = '32',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/win-archive-dbg',
-            category = 'win|dbg',
-            short_name = '64',
-        ),
-    ],
-)

infra/config/generated/luci-milo.cfg

@@ -371,23 +371,23 @@ consoles: <
     short_name: "rel"
   >
   builders: <
-    name: "buildbucket/luci.chromium.ci/win32-archive-rel"
-    category: "win|rel"
+    name: "buildbucket/luci.chromium.ci/win32-archive-dbg"
+    category: "win|dbg"
     short_name: "32"
   >
   builders: <
-    name: "buildbucket/luci.chromium.ci/win-archive-rel"
-    category: "win|rel"
+    name: "buildbucket/luci.chromium.ci/win-archive-dbg"
+    category: "win|dbg"
     short_name: "64"
   >
   builders: <
-    name: "buildbucket/luci.chromium.ci/win32-archive-dbg"
-    category: "win|dbg"
+    name: "buildbucket/luci.chromium.ci/win32-archive-rel"
+    category: "win|rel"
     short_name: "32"
   >
   builders: <
-    name: "buildbucket/luci.chromium.ci/win-archive-dbg"
-    category: "win|dbg"
+    name: "buildbucket/luci.chromium.ci/win-archive-rel"
+    category: "win|rel"
     short_name: "64"
   >
   header: <
@@ -10574,23 +10574,23 @@ consoles: <
     short_name: "rel"
   >
   builders: <
-    name: "buildbucket/luci.chromium.ci/win32-archive-rel"
-    category: "chromium|win|rel"
+    name: "buildbucket/luci.chromium.ci/win32-archive-dbg"
+    category: "chromium|win|dbg"
     short_name: "32"
   >
   builders: <
-    name: "buildbucket/luci.chromium.ci/win-archive-rel"
-    category: "chromium|win|rel"
+    name: "buildbucket/luci.chromium.ci/win-archive-dbg"
+    category: "chromium|win|dbg"
     short_name: "64"
   >
   builders: <
-    name: "buildbucket/luci.chromium.ci/win32-archive-dbg"
-    category: "chromium|win|dbg"
+    name: "buildbucket/luci.chromium.ci/win32-archive-rel"
+    category: "chromium|win|rel"
     short_name: "32"
   >
   builders: <
-    name: "buildbucket/luci.chromium.ci/win-archive-dbg"
-    category: "chromium|win|dbg"
+    name: "buildbucket/luci.chromium.ci/win-archive-rel"
+    category: "chromium|win|rel"
     short_name: "64"
   >
   builders: <

infra/config/lib/ci.star

@@ -19,6 +19,8 @@ defaults = args.defaults(
     extends=builders.defaults,
     add_to_console_view = False,
     console_view = args.COMPUTE,
+    header = None,
+    repo = None,
 )
 
 
@@ -161,7 +163,12 @@ 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.
+    kwargs - Additional keyword arguments to forward on to
+      `luci.console_view`. The header and repo arguments support
+       module-level defaults.
   """
+  kwargs['header'] = defaults.get_value_from_kwargs('header', kwargs)
+  kwargs['repo'] = defaults.get_value_from_kwargs('repo', kwargs)
   luci.console_view(
       name = name,
       **kwargs

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

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

@@ -41,23 +41,23 @@ luci.console_view(
             short_name = 'rel',
         ),
         luci.console_view_entry(
-            builder = builder_name('win32-archive-rel'),
-            category = 'chromium|win|rel',
+            builder = builder_name('win32-archive-dbg'),
+            category = 'chromium|win|dbg',
             short_name = '32',
         ),
         luci.console_view_entry(
-            builder = builder_name('win-archive-rel'),
-            category = 'chromium|win|rel',
+            builder = builder_name('win-archive-dbg'),
+            category = 'chromium|win|dbg',
             short_name = '64',
         ),
         luci.console_view_entry(
-            builder = builder_name('win32-archive-dbg'),
-            category = 'chromium|win|dbg',
+            builder = builder_name('win32-archive-rel'),
+            category = 'chromium|win|rel',
             short_name = '32',
         ),
         luci.console_view_entry(
-            builder = builder_name('win-archive-dbg'),
-            category = 'chromium|win|dbg',
+            builder = builder_name('win-archive-rel'),
+            category = 'chromium|win|rel',
             short_name = '64',
         ),
         luci.console_view_entry(