Define the chromium.dawn console entries at the builders.

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

infra/config/buckets/ci.star

@@ -54,6 +54,23 @@ ci.console_view(
     },
 )
 
+ci.console_view(
+    name = 'chromium.dawn',
+    ordering = {
+        None: ['ToT'],
+        '*builder*': ['Builder'],
+        '*cpu*': ci.ordering(short_names=['x86']),
+        'ToT|Mac': '*builder*',
+        'ToT|Windows|Builder': '*cpu*',
+        'ToT|Windows|Intel': '*cpu*',
+        'ToT|Windows|Nvidia': '*cpu*',
+        'DEPS|Mac': '*builder*',
+        'DEPS|Windows|Builder': '*cpu*',
+        'DEPS|Windows|Intel': '*cpu*',
+        'DEPS|Windows|Nvidia': '*cpu*',
+    },
+)
+
 ci.console_view(
     name = 'chromium.linux',
     ordering = {
@@ -739,10 +756,18 @@ ci.clang_mac_builder(
 
 ci.dawn_builder(
     name = 'Dawn Linux x64 Builder',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT|Linux|Builder',
+        short_name = 'x64',
+    ),
 )
 
 ci.dawn_builder(
     name = 'Dawn Linux x64 Release (Intel HD 630)',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT|Linux|Intel',
+        short_name = 'x64',
+    ),
     cores = 2,
     os = os.LINUX_DEFAULT,
     triggered_by = ['Dawn Linux x64 Builder'],
@@ -750,6 +775,10 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = 'Dawn Linux x64 Release (NVIDIA)',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT|Linux|Nvidia',
+        short_name = 'x64',
+    ),
     cores = 2,
     os = os.LINUX_DEFAULT,
     triggered_by = ['Dawn Linux x64 Builder'],
@@ -757,6 +786,10 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = 'Dawn Mac x64 Builder',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT|Mac|Builder',
+        short_name = 'x64',
+    ),
     builderless = False,
     cores = None,
     os = os.MAC_ANY,
@@ -764,6 +797,10 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = 'Dawn Mac x64 Release (AMD)',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT|Mac|AMD',
+        short_name = 'x64',
+    ),
     cores = 2,
     os = os.LINUX_DEFAULT,
     triggered_by = ['Dawn Mac x64 Builder'],
@@ -771,6 +808,10 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = 'Dawn Mac x64 Release (Intel)',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT|Mac|Intel',
+        short_name = 'x64',
+    ),
     cores = 2,
     os = os.LINUX_DEFAULT,
     triggered_by = ['Dawn Mac x64 Builder'],
@@ -778,11 +819,19 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = 'Dawn Win10 x86 Builder',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT|Windows|Builder',
+        short_name = 'x86',
+    ),
     os = os.WINDOWS_ANY,
 )
 
 ci.dawn_builder(
     name = 'Dawn Win10 x64 Builder',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT|Windows|Builder',
+        short_name = 'x64',
+    ),
     os = os.WINDOWS_ANY,
 )
 
@@ -790,6 +839,10 @@ ci.dawn_builder(
 # physical Win hardware in the Swarming pool, which is why they run on linux
 ci.dawn_builder(
     name = 'Dawn Win10 x86 Release (Intel HD 630)',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT|Windows|Intel',
+        short_name = 'x86',
+    ),
     cores = 2,
     os = os.LINUX_DEFAULT,
     triggered_by = ['Dawn Win10 x86 Builder'],
@@ -797,6 +850,10 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = 'Dawn Win10 x64 Release (Intel HD 630)',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT|Windows|Intel',
+        short_name = 'x64',
+    ),
     cores = 2,
     os = os.LINUX_DEFAULT,
     triggered_by = ['Dawn Win10 x64 Builder'],
@@ -804,6 +861,10 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = 'Dawn Win10 x86 Release (NVIDIA)',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT|Windows|Nvidia',
+        short_name = 'x86',
+    ),
     cores = 2,
     os = os.LINUX_DEFAULT,
     triggered_by = ['Dawn Win10 x86 Builder'],
@@ -811,6 +872,10 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = 'Dawn Win10 x64 Release (NVIDIA)',
+    console_view_entry = ci.console_view_entry(
+        category = 'ToT|Windows|Nvidia',
+        short_name = 'x64',
+    ),
     cores = 2,
     os = os.LINUX_DEFAULT,
     triggered_by = ['Dawn Win10 x64 Builder'],

infra/config/consoles/chromium.dawn.star

-luci.console_view(
-    name = 'chromium.dawn',
-    header = '//consoles/chromium-header.textpb',
-    repo = 'https://chromium.googlesource.com/chromium/src',
-    entries = [
-        luci.console_view_entry(
-            builder = 'ci/Dawn Linux x64 Builder',
-            category = 'ToT|Linux|Builder',
-            short_name = 'x64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Dawn Linux x64 Release (Intel HD 630)',
-            category = 'ToT|Linux|Intel',
-            short_name = 'x64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Dawn Linux x64 Release (NVIDIA)',
-            category = 'ToT|Linux|Nvidia',
-            short_name = 'x64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Dawn Mac x64 Builder',
-            category = 'ToT|Mac|Builder',
-            short_name = 'x64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Dawn Mac x64 Release (AMD)',
-            category = 'ToT|Mac|AMD',
-            short_name = 'x64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Dawn Mac x64 Release (Intel)',
-            category = 'ToT|Mac|Intel',
-            short_name = 'x64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Dawn Win10 x86 Builder',
-            category = 'ToT|Windows|Builder',
-            short_name = 'x86',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Dawn Win10 x64 Builder',
-            category = 'ToT|Windows|Builder',
-            short_name = 'x64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Dawn Win10 x86 Release (Intel HD 630)',
-            category = 'ToT|Windows|Intel',
-            short_name = 'x86',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Dawn Win10 x64 Release (Intel HD 630)',
-            category = 'ToT|Windows|Intel',
-            short_name = 'x64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Dawn Win10 x86 Release (NVIDIA)',
-            category = 'ToT|Windows|Nvidia',
-            short_name = 'x86',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Dawn Win10 x64 Release (NVIDIA)',
-            category = 'ToT|Windows|Nvidia',
-            short_name = 'x64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Dawn Linux x64 DEPS Builder',
-            category = 'DEPS|Linux|Builder',
-            short_name = 'x64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Dawn Linux x64 DEPS Release (Intel HD 630)',
-            category = 'DEPS|Linux|Intel',
-            short_name = 'x64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Dawn Linux x64 DEPS Release (NVIDIA)',
-            category = 'DEPS|Linux|Nvidia',
-            short_name = 'x64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Dawn Mac x64 DEPS Builder',
-            category = 'DEPS|Mac|Builder',
-            short_name = 'x64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Dawn Mac x64 DEPS Release (AMD)',
-            category = 'DEPS|Mac|AMD',
-            short_name = 'x64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Dawn Mac x64 DEPS Release (Intel)',
-            category = 'DEPS|Mac|Intel',
-            short_name = 'x64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Dawn Win10 x86 DEPS Builder',
-            category = 'DEPS|Windows|Builder',
-            short_name = 'x86',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Dawn Win10 x64 DEPS Builder',
-            category = 'DEPS|Windows|Builder',
-            short_name = 'x64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Dawn Win10 x86 DEPS Release (Intel HD 630)',
-            category = 'DEPS|Windows|Intel',
-            short_name = 'x86',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Dawn Win10 x64 DEPS Release (Intel HD 630)',
-            category = 'DEPS|Windows|Intel',
-            short_name = 'x64',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Dawn Win10 x86 DEPS Release (NVIDIA)',
-            category = 'DEPS|Windows|Nvidia',
-            short_name = 'x86',
-        ),
-        luci.console_view_entry(
-            builder = 'ci/Dawn Win10 x64 DEPS Release (NVIDIA)',
-            category = 'DEPS|Windows|Nvidia',
-            short_name = 'x64',
-        ),
-    ],
-)

infra/config/main.star

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

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

@@ -274,10 +274,18 @@ ci.chromiumos_builder(
 
 ci.dawn_builder(
     name = 'Dawn Linux x64 DEPS Builder',
+    console_view_entry = ci.console_view_entry(
+        category = 'DEPS|Linux|Builder',
+        short_name = 'x64',
+    ),
 )
 
 ci.dawn_builder(
     name = 'Dawn Linux x64 DEPS Release (Intel HD 630)',
+    console_view_entry = ci.console_view_entry(
+        category = 'DEPS|Linux|Intel',
+        short_name = 'x64',
+    ),
     cores = 2,
     os = os.LINUX_DEFAULT,
     triggered_by = [builder_name('Dawn Linux x64 DEPS Builder')],
@@ -285,6 +293,10 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = 'Dawn Linux x64 DEPS Release (NVIDIA)',
+    console_view_entry = ci.console_view_entry(
+        category = 'DEPS|Linux|Nvidia',
+        short_name = 'x64',
+    ),
     cores = 2,
     os = os.LINUX_DEFAULT,
     triggered_by = [builder_name('Dawn Linux x64 DEPS Builder')],
@@ -293,6 +305,10 @@ ci.dawn_builder(
 ci.dawn_builder(
     name = 'Dawn Mac x64 DEPS Builder',
     builderless = False,
+    console_view_entry = ci.console_view_entry(
+        category = 'DEPS|Mac|Builder',
+        short_name = 'x64',
+    ),
     cores = None,
     os = os.MAC_ANY,
 )
@@ -301,6 +317,10 @@ ci.dawn_builder(
 # physical Mac hardware in the Swarming pool which is why they run on linux
 ci.dawn_builder(
     name = 'Dawn Mac x64 DEPS Release (AMD)',
+    console_view_entry = ci.console_view_entry(
+        category = 'DEPS|Mac|AMD',
+        short_name = 'x64',
+    ),
     cores = 2,
     os = os.LINUX_DEFAULT,
     triggered_by = [builder_name('Dawn Mac x64 DEPS Builder')],
@@ -308,6 +328,10 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = 'Dawn Mac x64 DEPS Release (Intel)',
+    console_view_entry = ci.console_view_entry(
+        category = 'DEPS|Mac|Intel',
+        short_name = 'x64',
+    ),
     cores = 2,
     os = os.LINUX_DEFAULT,
     triggered_by = [builder_name('Dawn Mac x64 DEPS Builder')],
@@ -315,11 +339,19 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = 'Dawn Win10 x64 DEPS Builder',
+    console_view_entry = ci.console_view_entry(
+        category = 'DEPS|Windows|Builder',
+        short_name = 'x64',
+    ),
     os = os.WINDOWS_ANY,
 )
 
 ci.dawn_builder(
     name = 'Dawn Win10 x64 DEPS Release (Intel HD 630)',
+    console_view_entry = ci.console_view_entry(
+        category = 'DEPS|Windows|Intel',
+        short_name = 'x64',
+    ),
     cores = 2,
     os = os.LINUX_DEFAULT,
     triggered_by = [builder_name('Dawn Win10 x64 DEPS Builder')],
@@ -327,6 +359,10 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = 'Dawn Win10 x64 DEPS Release (NVIDIA)',
+    console_view_entry = ci.console_view_entry(
+        category = 'DEPS|Windows|Nvidia',
+        short_name = 'x64',
+    ),
     cores = 2,
     os = os.LINUX_DEFAULT,
     triggered_by = [builder_name('Dawn Win10 x64 DEPS Builder')],
@@ -334,11 +370,19 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = 'Dawn Win10 x86 DEPS Builder',
+    console_view_entry = ci.console_view_entry(
+        category = 'DEPS|Windows|Builder',
+        short_name = 'x86',
+    ),
     os = os.WINDOWS_ANY,
 )
 
 ci.dawn_builder(
     name = 'Dawn Win10 x86 DEPS Release (Intel HD 630)',
+    console_view_entry = ci.console_view_entry(
+        category = 'DEPS|Windows|Intel',
+        short_name = 'x86',
+    ),
     cores = 2,
     os = os.LINUX_DEFAULT,
     triggered_by = [builder_name('Dawn Win10 x86 DEPS Builder')],
@@ -346,6 +390,10 @@ ci.dawn_builder(
 
 ci.dawn_builder(
     name = 'Dawn Win10 x86 DEPS Release (NVIDIA)',
+    console_view_entry = ci.console_view_entry(
+        category = 'DEPS|Windows|Nvidia',
+        short_name = 'x86',
+    ),
     cores = 2,
     os = os.LINUX_DEFAULT,
     triggered_by = [builder_name('Dawn Win10 x86 DEPS Builder')],