3 files changed, 146 insertions, 87 deletions

diff --git a/tools/luci/config/generated/luci-milo.cfg b/tools/luci/config/generated/luci-milo.cfg
index a1a06892ff..30baf3e053 100644
--- a/tools/luci/config/generated/luci-milo.cfg
+++ b/tools/luci/config/generated/luci-milo.cfg
@@ -41,34 +41,44 @@ consoles {
     short_name: "ndbg"
   }
   builders {
-    name: "buildbucket/luci.art.ci/bullhead-armv7-gcstress-ndebug"
-    category: "bullhead|armv7|gcstress"
-    short_name: "ndbg"
+    name: "buildbucket/luci.art.ci/target.arm.gsctress.debug.32"
+    category: "target.arm|gsctress|debug"
+    short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.art.ci/bullhead-armv8-gcstress-debug"
-    category: "bullhead|armv8|gcstress"
-    short_name: "dbg"
+    name: "buildbucket/luci.art.ci/target.arm.poison.debug.32"
+    category: "target.arm|poison|debug"
+    short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.art.ci/bullhead-armv8-gcstress-ndebug"
-    category: "bullhead|armv8|gcstress"
-    short_name: "ndbg"
+    name: "buildbucket/luci.art.ci/target.arm.gsctress.ndebug.32"
+    category: "target.arm|gsctress|ndebug"
+    short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.art.ci/walleye-armv7-poison-debug"
-    category: "walleye|armv7|poison"
-    short_name: "dbg"
+    name: "buildbucket/luci.art.ci/target.arm.poison.ndebug.32"
+    category: "target.arm|poison|ndebug"
+    short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.art.ci/walleye-armv8-poison-debug"
-    category: "walleye|armv8|poison"
-    short_name: "dbg"
+    name: "buildbucket/luci.art.ci/target.arm.gsctress.debug.64"
+    category: "target.arm|gsctress|debug"
+    short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.art.ci/walleye-armv8-poison-ndebug"
-    category: "walleye|armv8|poison"
-    short_name: "ndbg"
+    name: "buildbucket/luci.art.ci/target.arm.poison.debug.64"
+    category: "target.arm|poison|debug"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.art.ci/target.arm.gsctress.ndebug.64"
+    category: "target.arm|gsctress|ndebug"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.art.ci/target.arm.poison.ndebug.64"
+    category: "target.arm|poison|ndebug"
+    short_name: "64"
   }
   builders {
     name: "buildbucket/luci.art.ci/host-x86-cms"
@@ -76,49 +86,54 @@ consoles {
     short_name: "cms"
   }
   builders {
-    name: "buildbucket/luci.art.ci/host-x86-debug"
-    category: "host|x86"
-    short_name: "dbg"
+    name: "buildbucket/luci.art.ci/host.x86.debug.32"
+    category: "host.x86|debug"
+    short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.art.ci/host-x86-ndebug"
-    category: "host|x86"
-    short_name: "ndbg"
+    name: "buildbucket/luci.art.ci/host.x86.ndebug.32"
+    category: "host.x86|ndebug"
+    short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.art.ci/host-x86-gcstress-debug"
-    category: "host|x86"
-    short_name: "gcs"
+    name: "buildbucket/luci.art.ci/host.x86.gsctress.debug.32"
+    category: "host.x86|gsctress|debug"
+    short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.art.ci/host-x86-poison-debug"
-    category: "host|x86"
-    short_name: "psn"
+    name: "buildbucket/luci.art.ci/host.x86.poison.debug.32"
+    category: "host.x86|poison|debug"
+    short_name: "32"
   }
   builders {
-    name: "buildbucket/luci.art.ci/host-x86_64-cms"
-    category: "host|x64"
-    short_name: "cms"
+    name: "buildbucket/luci.art.ci/host.x86.debug.64"
+    category: "host.x86|debug"
+    short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.art.ci/host-x86_64-debug"
-    category: "host|x64"
-    short_name: "dbg"
+    name: "buildbucket/luci.art.ci/host.x86.ndebug.64"
+    category: "host.x86|ndebug"
+    short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.art.ci/host-x86_64-non-gen-cc"
-    category: "host|x64"
-    short_name: "ngen"
+    name: "buildbucket/luci.art.ci/host.x86.gsctress.debug.64"
+    category: "host.x86|gsctress|debug"
+    short_name: "64"
   }
   builders {
-    name: "buildbucket/luci.art.ci/host-x86_64-ndebug"
+    name: "buildbucket/luci.art.ci/host.x86.poison.debug.64"
+    category: "host.x86|poison|debug"
+    short_name: "64"
+  }
+  builders {
+    name: "buildbucket/luci.art.ci/host-x86_64-cms"
     category: "host|x64"
-    short_name: "ndbg"
+    short_name: "cms"
   }
   builders {
-    name: "buildbucket/luci.art.ci/host-x86_64-poison-debug"
+    name: "buildbucket/luci.art.ci/host-x86_64-non-gen-cc"
     category: "host|x64"
-    short_name: "psn"
+    short_name: "ngen"
   }
   builders {
     name: "buildbucket/luci.art.ci/qemu-armv8-ndebug"
diff --git a/tools/luci/config/generated/luci-notify.cfg b/tools/luci/config/generated/luci-notify.cfg
index e99b2f4ae1..2f208a4400 100644
--- a/tools/luci/config/generated/luci-notify.cfg
+++ b/tools/luci/config/generated/luci-notify.cfg
@@ -92,7 +92,7 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "bullhead-armv7-gcstress-ndebug"
+    name: "host-x86-cms"
   }
 }
 notifiers {
@@ -105,7 +105,7 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "bullhead-armv8-gcstress-debug"
+    name: "host-x86_64-cms"
   }
 }
 notifiers {
@@ -118,7 +118,7 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "bullhead-armv8-gcstress-ndebug"
+    name: "host-x86_64-non-gen-cc"
   }
 }
 notifiers {
@@ -131,7 +131,7 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "host-x86-cms"
+    name: "host.x86.debug.32"
   }
 }
 notifiers {
@@ -144,7 +144,7 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "host-x86-debug"
+    name: "host.x86.debug.64"
   }
 }
 notifiers {
@@ -157,7 +157,7 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "host-x86-gcstress-debug"
+    name: "host.x86.gsctress.debug.32"
   }
 }
 notifiers {
@@ -170,7 +170,7 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "host-x86-ndebug"
+    name: "host.x86.gsctress.debug.64"
   }
 }
 notifiers {
@@ -183,7 +183,7 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "host-x86-poison-debug"
+    name: "host.x86.ndebug.32"
   }
 }
 notifiers {
@@ -196,7 +196,7 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "host-x86_64-cms"
+    name: "host.x86.ndebug.64"
   }
 }
 notifiers {
@@ -209,7 +209,7 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "host-x86_64-debug"
+    name: "host.x86.poison.debug.32"
   }
 }
 notifiers {
@@ -222,7 +222,7 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "host-x86_64-ndebug"
+    name: "host.x86.poison.debug.64"
   }
 }
 notifiers {
@@ -235,7 +235,7 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "host-x86_64-non-gen-cc"
+    name: "qemu-armv8-ndebug"
   }
 }
 notifiers {
@@ -248,7 +248,7 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "host-x86_64-poison-debug"
+    name: "qemu-riscv64-ndebug"
   }
 }
 notifiers {
@@ -261,7 +261,7 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "qemu-armv8-ndebug"
+    name: "target.arm.gsctress.debug.32"
   }
 }
 notifiers {
@@ -274,7 +274,46 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "qemu-riscv64-ndebug"
+    name: "target.arm.gsctress.debug.64"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: FAILURE
+    on_new_status: INFRA_FAILURE
+    email {
+      recipients: "art-team+chromium-buildbot@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "target.arm.gsctress.ndebug.32"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: FAILURE
+    on_new_status: INFRA_FAILURE
+    email {
+      recipients: "art-team+chromium-buildbot@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "target.arm.gsctress.ndebug.64"
+  }
+}
+notifiers {
+  notifications {
+    on_new_status: FAILURE
+    on_new_status: INFRA_FAILURE
+    email {
+      recipients: "art-team+chromium-buildbot@google.com"
+    }
+  }
+  builders {
+    bucket: "ci"
+    name: "target.arm.poison.debug.32"
   }
 }
 notifiers {
@@ -287,7 +326,7 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "walleye-armv7-poison-debug"
+    name: "target.arm.poison.debug.64"
   }
 }
 notifiers {
@@ -300,7 +339,7 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "walleye-armv8-poison-debug"
+    name: "target.arm.poison.ndebug.32"
   }
 }
 notifiers {
@@ -313,6 +352,6 @@ notifiers {
   }
   builders {
     bucket: "ci"
-    name: "walleye-armv8-poison-ndebug"
+    name: "target.arm.poison.ndebug.64"
   }
 }
diff --git a/tools/luci/config/main.star b/tools/luci/config/main.star
index 673f3250ae..55158c7a9e 100755
--- a/tools/luci/config/main.star
+++ b/tools/luci/config/main.star
@@ -227,7 +227,8 @@ def add_builder(name,
                 cc=True,
                 gen_cc=True,
                 gcstress=False,
-                heap_poisoning=False):
+                heap_poisoning=False,
+                hidden=False):
     def check_arg(value, valid_values):
       if value not in valid_values:
         fail("Argument '{}' was expected to be on of {}".format(value, valid_values))
@@ -246,15 +247,20 @@ def add_builder(name,
 
     # Create abbreviated named which is used to create the LUCI console header.
     # TODO: Rename the builders to remove old device names and make it more uniform.
-    short_name = name or default_name.replace(".", "-")
-    short_name = short_name.replace("-x86-poison-debug", "-x86-psn")
-    short_name = short_name.replace("-x86-gcstress-debug", "-x86-gcs")
-    short_name = short_name.replace("-x86_64-poison-debug", "-x86_64-psn")
-    short_name = short_name.replace("-x86_64", "-x64")
-    short_name = short_name.replace("-ndebug-build_only", "-bo")
-    short_name = short_name.replace("-non-gen-cc", "-ngen")
-    short_name = short_name.replace("-debug", "-dbg")
-    short_name = short_name.replace("-ndebug", "-ndbg")
+    if name:
+      short_name = name
+      short_name = short_name.replace("-x86-poison-debug", "-x86-psn")
+      short_name = short_name.replace("-x86-gcstress-debug", "-x86-gcs")
+      short_name = short_name.replace("-x86_64-poison-debug", "-x86_64-psn")
+      short_name = short_name.replace("-x86_64", "-x64")
+      short_name = short_name.replace("-ndebug-build_only", "-bo")
+      short_name = short_name.replace("-non-gen-cc", "-ngen")
+      short_name = short_name.replace("-debug", "-dbg")
+      short_name = short_name.replace("-ndebug", "-ndbg")
+      category = short_name.split("-")
+    else:
+      category = default_name.split(".")
+      category = [category[0] + "." + category[1]] + category[2:]
 
     product = None
     if arch == "arm":
@@ -286,7 +292,6 @@ def add_builder(name,
     testrunner_args += ['--debug'] if debug else ['--ndebug']
     testrunner_args += ['--gcstress'] if gcstress else []
 
-    hidden = not name  # Hide the new builders for now.
     name = name or default_name
 
     properties = {
@@ -305,8 +310,8 @@ def add_builder(name,
     }
 
     ci_builder(name,
-               category="|".join(short_name.split("-")[:-1]),
-               short_name=short_name.split("-")[-1],
+               category="|".join(category[:-1]),
+               short_name=category[-1],
                dimensions=dimensions,
                properties={k:v for k, v in properties.items() if v},
                hidden=hidden)
@@ -318,31 +323,31 @@ def add_builders():
   add_builder("angler-armv8-debug", 'target', 'arm', 64, debug=True)
   add_builder("angler-armv8-non-gen-cc", 'target', 'arm', 64, debug=True, cc=False, gen_cc=False)
   add_builder("angler-armv8-ndebug", 'target', 'arm', 64)
-  add_builder("bullhead-armv7-gcstress-ndebug", 'target', 'arm', 32, gcstress=True)
-  add_builder("bullhead-armv8-gcstress-debug", 'target', 'arm', 64, debug=True, gcstress=True)
-  add_builder("bullhead-armv8-gcstress-ndebug", 'target', 'arm', 64, gcstress=True)
-  add_builder("walleye-armv7-poison-debug", 'target', 'arm', 32, debug=True, heap_poisoning=True)
-  add_builder("walleye-armv8-poison-debug", 'target', 'arm', 64, debug=True, heap_poisoning=True)
-  add_builder("walleye-armv8-poison-ndebug", 'target', 'arm', 64, heap_poisoning=True)
+  add_builder("bullhead-armv7-gcstress-ndebug", 'target', 'arm', 32, gcstress=True, hidden=True)
+  add_builder("bullhead-armv8-gcstress-debug", 'target', 'arm', 64, debug=True, gcstress=True, hidden=True)
+  add_builder("bullhead-armv8-gcstress-ndebug", 'target', 'arm', 64, gcstress=True, hidden=True)
+  add_builder("walleye-armv7-poison-debug", 'target', 'arm', 32, debug=True, heap_poisoning=True, hidden=True)
+  add_builder("walleye-armv8-poison-debug", 'target', 'arm', 64, debug=True, heap_poisoning=True, hidden=True)
+  add_builder("walleye-armv8-poison-ndebug", 'target', 'arm', 64, heap_poisoning=True, hidden=True)
   for bitness in [32, 64]:
     for debug in [True, False]:
       add_builder('', 'target', 'arm', bitness, debug, gcstress=True)
       add_builder('', 'target', 'arm', bitness, debug, heap_poisoning=True)
   add_builder("host-x86-cms", 'host', 'x86', 32, debug=True, cc=False, gen_cc=False)
-  add_builder("host-x86-debug", 'host', 'x86', 32, debug=True)
-  add_builder("host-x86-ndebug", 'host', 'x86', 32)
-  add_builder("host-x86-gcstress-debug", 'host', 'x86', 32, debug=True, gcstress=True)
-  add_builder("host-x86-poison-debug", 'host', 'x86', 32, debug=True, heap_poisoning=True)
+  add_builder("host-x86-debug", 'host', 'x86', 32, debug=True, hidden=True)
+  add_builder("host-x86-ndebug", 'host', 'x86', 32, hidden=True)
+  add_builder("host-x86-gcstress-debug", 'host', 'x86', 32, debug=True, gcstress=True, hidden=True)
+  add_builder("host-x86-poison-debug", 'host', 'x86', 32, debug=True, heap_poisoning=True, hidden=True)
   for bitness in [32, 64]:
     add_builder('', 'host', 'x86', bitness, debug=True)
     add_builder('', 'host', 'x86', bitness, debug=False)
     add_builder('', 'host', 'x86', bitness, debug=True, gcstress=True)
     add_builder('', 'host', 'x86', bitness, debug=True, heap_poisoning=True)
   add_builder("host-x86_64-cms", 'host', 'x86', 64, cc=False, debug=True, gen_cc=False)
-  add_builder("host-x86_64-debug", 'host', 'x86', 64, debug=True)
+  add_builder("host-x86_64-debug", 'host', 'x86', 64, debug=True, hidden=True)
   add_builder("host-x86_64-non-gen-cc", 'host', 'x86', 64, debug=True, gen_cc=False)
-  add_builder("host-x86_64-ndebug", 'host', 'x86', 64)
-  add_builder("host-x86_64-poison-debug", 'host', 'x86', 64, debug=True, heap_poisoning=True)
+  add_builder("host-x86_64-ndebug", 'host', 'x86', 64, hidden=True)
+  add_builder("host-x86_64-poison-debug", 'host', 'x86', 64, debug=True, heap_poisoning=True, hidden=True)
   add_builder("qemu-armv8-ndebug", 'qemu', 'arm', 64)
   add_builder("qemu-riscv64-ndebug", 'qemu', 'riscv', 64)