[monitor] Update and rework buildbot list

- Update bot names after rename.
- Mention full bots only in "Full Bots" section.

Change-Id: I7129e8b856221e02949fa36bcb041705e0ec2c70

1 files changed, 30 insertions, 47 deletions

diff --git a/monitor/linaro.json b/monitor/linaro.json
index d91ed1d..7abe53a 100644
--- a/monitor/linaro.json
+++ b/monitor/linaro.json
@@ -6,44 +6,38 @@
     "build_url": "builds",
     "builders": [
       {
-        "name": "Fast Bots",
+        "name": "Quick Bots",
         "bots": [
-          { "name": "clang-cmake-armv7-quick" },
-          { "name": "clang-cmake-aarch64-quick" }
+          { "name": "clang-armv7-quick" },
+          { "name": "clang-aarch64-quick" }
         ]
       },
       {
-        "name": "Full Bots (LLVM, Clang, RT)",
+        "name": "Full Bots (LLVM, Clang, Compiler-RT, Testsuite, 2-Stage)",
         "bots": [
-          { "name": "clang-cmake-armv7-full" },
-          { "name": "clang-cmake-thumbv7-full-sh" },
-          { "name": "clang-cmake-aarch64-lld" },
-          { "name": "clang-cmake-aarch64-full" }
+          { "name": "clang-armv7-vfpv3-full-2stage" },
+          { "name": "clang-thumbv7-full-2stage" },
+          { "name": "clang-armv8-lld-2stage" },
+          { "name": "clang-aarch64-lld-2stage" },
+          { "name": "clang-aarch64-full-2stage" }
         ]
       },
       {
-        "name": "Self Hosting Bots",
+        "name": "2-stage Bots (w/o Full Bots)",
         "bots": [
-          { "name": "clang-cmake-armv7-selfhost" },
-          { "name": "clang-cmake-armv7-selfhost-neon" },
-          { "name": "clang-cmake-thumbv7-full-sh" },
-          { "name": "clang-cmake-armv8-lld" },
-          { "name": "clang-cmake-aarch64-full" },
-          { "name": "clang-cmake-aarch64-lld" }
+          { "name": "clang-armv7-2stage" },
+          { "name": "clang-armv7-vfpv3-2stage" },
+          { "name": "clang-aarch64-sve-vls-2stage" },
+          { "name": "clang-arm64-windows-msvc-2stage" }
         ]
       },
       {
-        "name": "Test-Suite Bots",
+        "name": "Test-Suite Bots (w/o Full Bots)",
         "bots": [
-          { "name": "clang-cmake-armv7-lnt" },
-          { "name": "clang-cmake-armv7-global-isel"},
-          { "name": "clang-cmake-armv8-lld" },
-          { "name": "clang-cmake-armv7-full" },
-          { "name": "clang-cmake-thumbv7-full-sh" },
-          { "name": "clang-cmake-aarch64-quick" },
-          { "name": "clang-cmake-aarch64-full" },
-          { "name": "clang-cmake-aarch64-lld" },
-          { "name": "clang-cmake-aarch64-global-isel"}
+          { "name": "clang-armv7-lnt" },
+          { "name": "clang-armv7-global-isel" },
+          { "name": "clang-aarch64-global-isel" },
+          { "name": "clang-aarch64-sve-vls" }
         ]
       },
       {
@@ -54,13 +48,6 @@
         ]
       },
       {
-        "name": "LLD Bots",
-        "bots": [
-          { "name": "clang-cmake-armv8-lld" },
-          { "name": "clang-cmake-aarch64-lld" }
-        ]
-      },
-      {
         "name": "LLDB Bots",
         "bots": [
           { "name": "lldb-aarch64-ubuntu" },
@@ -70,21 +57,17 @@
       {
         "name": "Flang Bots",
         "bots": [
-          { "name": "clang-cmake-aarch64-full" },
-          { "name": "flang-aarch64-ubuntu-debug" },
-          { "name": "flang-aarch64-ubuntu-dylib" },
-          { "name": "flang-aarch64-ubuntu-latest-clang" },
-          { "name": "flang-aarch64-latest-gcc" },
-          { "name": "flang-aarch64-ubuntu-out-of-tree" },
-          { "name": "flang-aarch64-ubuntu-rel-assert" },
-          { "name": "flang-aarch64-ubuntu-release" },
-          { "name": "flang-aarch64-ubuntu-sharedlibs" }
-        ]
-      },
-      {
-        "name": "Cross-Compilation Bots",
-        "ignore" : true,
-        "bots": [
+          { "name": "clang-aarch64-full-2stage" },
+          { "name": "clang-aarch64-sve-vls" },
+          { "name": "clang-aarch64-sve-vls-2stage" },
+          { "name": "flang-aarch64-dylib" },
+          { "name": "flang-aarch64-sharedlibs" },
+          { "name": "flang-aarch64-out-of-tree" },
+          { "name": "flang-aarch64-debug" },
+          { "name": "flang-aarch64-latest-clang" },
+          { "name": "flang-aarch64-release" },
+          { "name": "flang-aarch64-rel-assert" },
+          { "name": "flang-aarch64-latest-gcc" }
         ]
       },
       {