main.star: fix console_ids for dl and protobuf repos

CL 539280 changed console names in order to improve their sort order,
but missed one more place that needed updating.

Change-Id: I203d95415e601acec653dfe8eb4650851b89528d
Reviewed-on: https://go-review.googlesource.com/c/build/+/545535
TryBot-Bypass: Dmitri Shuralyov <[email protected]>
Reviewed-by: Michael Knyszek <[email protected]>
Reviewed-by: Dmitri Shuralyov <[email protected]>
Auto-Submit: Dmitri Shuralyov <[email protected]>

Author: dmitshur

generated/luci-milo.cfg

@@ -196,7 +196,7 @@ consoles {
       console_ids: "golang/x-build-gotip"
       console_ids: "golang/x-crypto-gotip"
       console_ids: "golang/x-debug-gotip"
-      console_ids: "golang/x-dl-gotip"
+      console_ids: "golang/z-dl-gotip"
       console_ids: "golang/x-exp-gotip"
       console_ids: "golang/x-image-gotip"
       console_ids: "golang/x-mobile-gotip"
@@ -206,7 +206,7 @@ consoles {
       console_ids: "golang/x-perf-gotip"
       console_ids: "golang/x-pkgsite-gotip"
       console_ids: "golang/x-pkgsite-metrics-gotip"
-      console_ids: "golang/x-protobuf-gotip"
+      console_ids: "golang/z-protobuf-gotip"
       console_ids: "golang/x-review-gotip"
       console_ids: "golang/x-sync-gotip"
       console_ids: "golang/x-sys-gotip"
@@ -400,7 +400,7 @@ consoles {
       console_ids: "golang/x-build-go1.21"
       console_ids: "golang/x-crypto-go1.21"
       console_ids: "golang/x-debug-go1.21"
-      console_ids: "golang/x-dl-go1.21"
+      console_ids: "golang/z-dl-go1.21"
       console_ids: "golang/x-exp-go1.21"
       console_ids: "golang/x-image-go1.21"
       console_ids: "golang/x-mobile-go1.21"
@@ -410,7 +410,7 @@ consoles {
       console_ids: "golang/x-perf-go1.21"
       console_ids: "golang/x-pkgsite-go1.21"
       console_ids: "golang/x-pkgsite-metrics-go1.21"
-      console_ids: "golang/x-protobuf-go1.21"
+      console_ids: "golang/z-protobuf-go1.21"
       console_ids: "golang/x-review-go1.21"
       console_ids: "golang/x-sync-go1.21"
       console_ids: "golang/x-sys-go1.21"
@@ -596,7 +596,7 @@ consoles {
       console_ids: "golang/x-build-go1.20"
       console_ids: "golang/x-crypto-go1.20"
       console_ids: "golang/x-debug-go1.20"
-      console_ids: "golang/x-dl-go1.20"
+      console_ids: "golang/z-dl-go1.20"
       console_ids: "golang/x-exp-go1.20"
       console_ids: "golang/x-image-go1.20"
       console_ids: "golang/x-mobile-go1.20"
@@ -606,7 +606,7 @@ consoles {
       console_ids: "golang/x-perf-go1.20"
       console_ids: "golang/x-pkgsite-go1.20"
       console_ids: "golang/x-pkgsite-metrics-go1.20"
-      console_ids: "golang/x-protobuf-go1.20"
+      console_ids: "golang/z-protobuf-go1.20"
       console_ids: "golang/x-review-go1.20"
       console_ids: "golang/x-sync-go1.20"
       console_ids: "golang/x-sys-go1.20"

main.star

@@ -607,7 +607,7 @@ def builder_name(project, go_branch_short, builder_type):
 # project_title produces a short title for the given project.
 def project_title(project):
     if project == "go":
-        fail("project_title isn't expected to be used for 'go'")
+        fail("project_title doesn't have support for the 'go' project")
     elif project == "dl":
         return "golang.org/dl"
     elif project == "protobuf":
@@ -617,6 +617,16 @@ def project_title(project):
         # the 'golang.org/' prefix is left out for brevity.
         return "x/" + project
 
+# console_name produces the console name for the given project and branch.
+def console_name(project, go_branch_short, suffix):
+    if project == "go":
+        fail("console_name doesn't have support for the 'go' project")
+    sort_letter = "x"
+    if not project_title(project).startswith("x/"):
+        # Put "z" at the beginning to sort this at the bottom of the page.
+        sort_letter = "z"
+    return "%s-%s-%s" % (sort_letter, project, go_branch_short) + suffix
+
 # Enum values for golangbuild's "mode" property.
 GOLANGBUILD_MODES = {
     "ALL": 0,
@@ -1205,7 +1215,7 @@ def _define_go_ci():
                                     # but because they have the same builder set and these
                                     # bubbles show just the latest build, it doesn't actually
                                     # matter.
-                                    "golang/x-%s-%s" % (project, go_branch_short)
+                                    "golang/" + console_name(project, go_branch_short, "")
                                     for project in PROJECTS
                                     if project != "go"
                                 ],
@@ -1215,19 +1225,15 @@ def _define_go_ci():
                 )
             else:
                 console_title = project_title(project) + "-" + go_branch_short
-                sort_letter = "x"
-                if not console_title.startswith("x/"):
-                    # Put "z" at the beginning to sort this at the bottom of the page.
-                    sort_letter = "z"
                 luci.console_view(
-                    name = "%s-%s-%s" % (sort_letter, project, go_branch_short),
+                    name = console_name(project, go_branch_short, ""),
                     repo = "https://go.googlesource.com/%s" % project,
                     title = console_title,
                     refs = ["refs/heads/master"],
                     entries = make_console_view_entries(postsubmit_builders),
                 )
                 luci.console_view(
-                    name = "%s-%s-%s-by-go" % (sort_letter, project, go_branch_short),
+                    name = console_name(project, go_branch_short, "-by-go"),
                     repo = "https://go.googlesource.com/go",
                     title = console_title + "-by-go-commit",
                     refs = ["refs/heads/" + go_branch.branch],