Move the main console definitions into the versioned directories.

This will simplify the process of updating the main consoles on branch
day.

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

infra/config/main.star

@@ -129,8 +129,6 @@ exec('//consoles/goma.latest.star')
 exec('//consoles/luci.chromium.goma.star')
 exec('//consoles/luci.chromium.try.star')
 exec('//consoles/main.star')
-exec('//consoles/main-m80.star')
-exec('//consoles/main-m81.star')
 exec('//consoles/sheriff.ios.star')
 exec('//consoles/try-m80.star')
 exec('//consoles/try-m81.star')

infra/config/consoles/main-m80.star → infra/config/versioned/milestones/m80/consoles/main.star

-# TOD(https://crbug.com/922150) Add to chromium header
+load('//lib/builders.star', 'builder_name', 'defaults')
+load('../vars.star', 'vars')
+
+defaults.bucket.set(vars.ci_bucket)
+
+# TODO(https://crbug.com/922150) Add to chromium header
 luci.console_view(
-    name = 'main-m80',
+    name = vars.main_console_name,
     header = '//consoles/chromium-header.textpb',
     repo = 'https://chromium.googlesource.com/chromium/src',
-    # TODO(gbeaty) Define the main consoles inside the respective versioned
-    # directories once their contents are stablilized
-    refs = ['refs/branch-heads/3987'],
-    title = 'Chromium M80 Console',
+    refs = [vars.ref],
+    title = vars.main_console_title,
     entries = [
         luci.console_view_entry(
-            builder = 'ci-m80/Linux Builder',
+            builder = builder_name('Linux Builder'),
             category = 'chromium.linux|release',
             short_name = 'bld',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/Linux Ozone Tester (Headless)',
+            builder = builder_name('Linux Ozone Tester (Headless)'),
             category = 'linux',
             short_name = 'loh',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/Linux Ozone Tester (Wayland)',
+            builder = builder_name('Linux Ozone Tester (Wayland)'),
             category = 'linux',
             short_name = 'low',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/Linux Ozone Tester (X11)',
+            builder = builder_name('Linux Ozone Tester (X11)'),
             category = 'linux',
             short_name = 'lox',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/Linux Tests',
+            builder = builder_name('Linux Tests'),
             category = 'chromium.linux|release',
             short_name = 'tst',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/linux-chromeos-rel',
+            builder = builder_name('linux-chromeos-rel'),
             category = 'chromium.chromiumos|default',
             short_name = 'rel',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/linux-ozone-rel',
+            builder = builder_name('linux-ozone-rel'),
             category = 'chromium.linux|release',
             short_name = 'ozo',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/chromeos-amd64-generic-rel',
+            builder = builder_name('chromeos-amd64-generic-rel'),
             category = 'chromium.chromiumos|simple|release|x64',
             short_name = 'rel',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/Mac Builder',
+            builder = builder_name('Mac Builder'),
             category = 'chromium.mac|release',
             short_name = 'bld',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/Mac10.10 Tests',
+            builder = builder_name('Mac10.10 Tests'),
             category = 'chromium.mac|release',
             short_name = '10',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/Mac10.11 Tests',
+            builder = builder_name('Mac10.11 Tests'),
             category = 'chromium.mac|release',
             short_name = '11',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/Mac10.12 Tests',
+            builder = builder_name('Mac10.12 Tests'),
             category = 'chromium.mac|release',
             short_name = '12',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/Mac10.13 Tests',
+            builder = builder_name('Mac10.13 Tests'),
             category = 'chromium.mac|release',
             short_name = '13',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/Mac10.14 Tests',
+            builder = builder_name('Mac10.14 Tests'),
             category = 'chromium.mac|release',
             short_name = '14',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/WebKit Mac10.13 (retina)',
+            builder = builder_name('WebKit Mac10.13 (retina)'),
             category = 'chromium.mac|release',
             short_name = 'ret',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/ios-simulator',
+            builder = builder_name('ios-simulator'),
             category = 'chromium.mac|ios|default',
             short_name = 'sim',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/Win x64 Builder',
+            builder = builder_name('Win x64 Builder'),
             category = 'chromium.win|release|builder',
             short_name = '64',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/Win 7 Tests x64 (1)',
+            builder = builder_name('Win 7 Tests x64 (1)'),
             category = 'chromium.win|release|tester',
             short_name = '64',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/Win10 Tests x64',
+            builder = builder_name('Win10 Tests x64'),
             category = 'chromium.win|release|tester',
             short_name = 'w10',
         ),
         # TODO(https://crbug.com/922150) Add the following builders to the main
         # console or don't have them be mirrored by main waterfall trybots
         luci.console_view_entry(
-            builder = 'ci-m80/android-kitkat-arm-rel',
+            builder = builder_name('android-kitkat-arm-rel'),
             category = 'chromium.android',
             short_name = 'k',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/android-marshmallow-arm64-rel',
+            builder = builder_name('android-marshmallow-arm64-rel'),
             category = 'chromium.android',
             short_name = 'm',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/mac-osxbeta-rel',
+            builder = builder_name('mac-osxbeta-rel'),
             category = 'chromium.fyi|mac',
             short_name = 'osxbeta',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/Win10 Tests x64 1803',
+            builder = builder_name('Win10 Tests x64 1803'),
             category = 'chromium.fyi|win10|1803',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/Android Release (Nexus 5X)',
+            builder = builder_name('Android Release (Nexus 5X)'),
             category = 'chromium.gpu|android',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/GPU Linux Builder',
+            builder = builder_name('GPU Linux Builder'),
             category = 'chromium.gpu|linux',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/Linux Release (NVIDIA)',
+            builder = builder_name('Linux Release (NVIDIA)'),
             category = 'chromium.gpu|linux',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/GPU Mac Builder',
+            builder = builder_name('GPU Mac Builder'),
             category = 'chromium.gpu|mac',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/Mac Release (Intel)',
+            builder = builder_name('Mac Release (Intel)'),
             category = 'chromium.gpu|mac',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/Mac Retina Release (AMD)',
+            builder = builder_name('Mac Retina Release (AMD)'),
             category = 'chromium.gpu|mac',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/GPU Win x64 Builder',
+            builder = builder_name('GPU Win x64 Builder'),
             category = 'chromium.gpu|win',
         ),
         luci.console_view_entry(
-            builder = 'ci-m80/Win10 x64 Release (NVIDIA)',
+            builder = builder_name('Win10 x64 Release (NVIDIA)'),
             category = 'chromium.gpu|win',
         ),
     ],

infra/config/versioned/milestones/m80/vars.star

@@ -4,5 +4,7 @@ vars = struct(
     ci_poller = 'm80-gitiles-trigger',
     try_bucket = 'try-m80',
     cq_group = 'cq-m80',
-    cq_ref_regexp = 'refs/branch-heads/3987'
+    cq_ref_regexp = 'refs/branch-heads/3987',
+    main_console_name = 'main-m80',
+    main_console_title = 'Chromium M80 Console',
 )

infra/config/versioned/milestones/m81/vars.star

@@ -5,4 +5,6 @@ vars = struct(
     try_bucket = 'try-m81',
     cq_group = 'cq-m81',
     cq_ref_regexp = 'refs/branch-heads/4044',
+    main_console_name = 'main-m81',
+    main_console_title = 'Chromium M81 Console',
 )

infra/config/versioned/trunk/vars.star

@@ -5,6 +5,8 @@ vars = struct(
     try_bucket = 'try',
     cq_group = 'cq',
     cq_ref_regexp = 'refs/heads/.+',
+    main_console_name = 'main',
+    main_console_title = 'Chromium Main Console',
     # Delete this line for branches
     tree_status_host = 'chromium-status.appspot.com/',
 )