Touch ups to luci-milo.cfg.

These changes simplify migrating to starlark by removing spurious diffs
from the semantic diff.

The repo_url, refs and header_id fields have no effect when
builder_view_only is true because builder views do not display headers
and do not display a list of changes being tested.

lucicfg enforces referential consistency, so a couple of non-existent
builders were removed. It also prevents a builder from being duplicated
in a builder view, so there was one repeated builder removed from
tryserver.chromium.mac console.

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

infra/config/generated/luci-milo.cfg

@@ -2153,10 +2153,6 @@ consoles {
     name: "buildbucket/luci.chromium.ci/fuchsia-fyi-x64-rel"
     category: "fuchsia"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Android Builder (dbg) Goma Canary"
-    category: "goma|android|debug"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/Linux Builder Goma Canary"
     category: "goma|linux"
@@ -2252,11 +2248,6 @@ consoles {
     category: "iOS"
     short_name: "wk"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/ios12-beta-simulator"
-    category: "iOS|iOS12"
-    short_name: "beta"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/ios13-sdk-device"
     category: "iOS|iOS13"
@@ -4084,12 +4075,9 @@ consoles {
 }
 
 consoles {
-  header_id: "chromium"
   id: "tryserver.chromium.android"
   name: "tryserver.chromium.android"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "refs/heads/master"
-  manifest_name: "REVISION"
+  builder_view_only: true
   builders {
     name: "buildbucket/luci.chromium.try/android-opus-kitkat-arm-rel"
   }
@@ -4234,16 +4222,12 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/android-webview-pie-arm64-dbg"
   }
-  builder_view_only: true
 }
 
 consoles {
-  header_id: "chromium"
   id: "tryserver.chromium.chromiumos"
   name: "tryserver.chromium.chromiumos"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "refs/heads/master"
-  manifest_name: "REVISION"
+  builder_view_only: true
   builders {
     name: "buildbucket/luci.chromium.try/chromeos-amd64-generic-dbg"
   }
@@ -4271,16 +4255,12 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/linux-chromeos-rel"
   }
-  builder_view_only: true
 }
 
 consoles {
-  header_id: "chromium"
   id: "tryserver.chromium.linux"
   name: "tryserver.chromium.linux"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "refs/heads/master"
-  manifest_name: "REVISION"
+  builder_view_only: true
   builders {
     name: "buildbucket/luci.chromium.try/cast_shell_audio_linux"
   }
@@ -4410,9 +4390,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_compile_dbg_32_ng"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_component_updater"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_msan_rel_ng"
   }
@@ -4446,16 +4423,12 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/linux_vr"
   }
-  builder_view_only: true
 }
 
 consoles {
-  header_id: "chromium"
   id: "tryserver.chromium.mac"
   name: "tryserver.chromium.mac"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "refs/heads/master"
-  manifest_name: "REVISION"
+  builder_view_only: true
   builders {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-amd-dqp"
   }
@@ -4540,9 +4513,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/mac_chromium_10.10"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/mac_chromium_10.10_macviews"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/mac_chromium_10.12_rel_ng"
   }
@@ -4564,25 +4534,18 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/mac_chromium_dbg_ng"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/mac_chromium_10.13_rel_ng"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/mac_optional_gpu_tests_rel"
   }
   builders {
     name: "buildbucket/luci.chromium.try/mac_upload_clang"
   }
-  builder_view_only: true
 }
 
 consoles {
-  header_id: "chromium"
   id: "tryserver.chromium.win"
   name: "tryserver.chromium.win"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "refs/heads/master"
-  manifest_name: "REVISION"
+  builder_view_only: true
   builders {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-win-xr-builder-64"
   }
@@ -4673,16 +4636,12 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/win-annotator-rel"
   }
-  builder_view_only: true
 }
 
 consoles {
-  header_id: ""
   id: "tryserver.blink"
   name: "tryserver.blink"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "refs/heads/master"
-  manifest_name: "REVISION"
+  builder_view_only: true
   builders {
     name: "buildbucket/luci.chromium.try/linux-blink-rel"
   }
@@ -4707,16 +4666,12 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/win7-blink-rel"
   }
-  builder_view_only: true
 }
 
 consoles {
-  header_id: "chromium"
   id: "angle.try"
   name: "angle.try"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "refs/heads/master"
-  manifest_name: "REVISION"
+  builder_view_only: true
   builders {
     name: "buildbucket/luci.chromium.try/android_angle_deqp_rel_ng"
   }
@@ -4762,16 +4717,12 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/win-angle-rel-64"
   }
-  builder_view_only: true
 }
 
 consoles {
-  header_id: "chromium"
   id: "luci.chromium.try"
   name: "luci.chromium.try"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "refs/heads/master"
-  manifest_name: "REVISION"
+  builder_view_only: true
   builders {
     name: "buildbucket/luci.chromium.try/android-cronet-arm-dbg"
   }
@@ -4784,9 +4735,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/android-marshmallow-arm64-rel"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/android-marshmallow-x64-fyi-rel"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/android-oreo-arm64-cts-networkservice-dbg"
   }
@@ -4889,9 +4837,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/closure_compilation"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/fuchsia"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/fuchsia-angle-rel"
   }
@@ -5138,9 +5083,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_compile_rel_ng"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_component_updater"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/linux-clang-tidy-dbg"
   }
@@ -5213,9 +5155,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/mac-rel"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/mac_chromium_10.10_macviews"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/mac_chromium_10.10"
   }
@@ -5315,7 +5254,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/win-celab-try-rel"
   }
-  builder_view_only: true
 }
 
 consoles {

infra/config/luci-milo.cfg

@@ -2153,10 +2153,6 @@ consoles {
     name: "buildbucket/luci.chromium.ci/fuchsia-fyi-x64-rel"
     category: "fuchsia"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/Android Builder (dbg) Goma Canary"
-    category: "goma|android|debug"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/Linux Builder Goma Canary"
     category: "goma|linux"
@@ -2252,11 +2248,6 @@ consoles {
     category: "iOS"
     short_name: "wk"
   }
-  builders {
-    name: "buildbucket/luci.chromium.ci/ios12-beta-simulator"
-    category: "iOS|iOS12"
-    short_name: "beta"
-  }
   builders {
     name: "buildbucket/luci.chromium.ci/ios13-sdk-device"
     category: "iOS|iOS13"
@@ -4084,12 +4075,9 @@ consoles {
 }
 
 consoles {
-  header_id: "chromium"
   id: "tryserver.chromium.android"
   name: "tryserver.chromium.android"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "refs/heads/master"
-  manifest_name: "REVISION"
+  builder_view_only: true
   builders {
     name: "buildbucket/luci.chromium.try/android-opus-kitkat-arm-rel"
   }
@@ -4234,16 +4222,12 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/android-webview-pie-arm64-dbg"
   }
-  builder_view_only: true
 }
 
 consoles {
-  header_id: "chromium"
   id: "tryserver.chromium.chromiumos"
   name: "tryserver.chromium.chromiumos"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "refs/heads/master"
-  manifest_name: "REVISION"
+  builder_view_only: true
   builders {
     name: "buildbucket/luci.chromium.try/chromeos-amd64-generic-dbg"
   }
@@ -4271,16 +4255,12 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/linux-chromeos-rel"
   }
-  builder_view_only: true
 }
 
 consoles {
-  header_id: "chromium"
   id: "tryserver.chromium.linux"
   name: "tryserver.chromium.linux"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "refs/heads/master"
-  manifest_name: "REVISION"
+  builder_view_only: true
   builders {
     name: "buildbucket/luci.chromium.try/cast_shell_audio_linux"
   }
@@ -4410,9 +4390,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_compile_dbg_32_ng"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_component_updater"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_msan_rel_ng"
   }
@@ -4446,16 +4423,12 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/linux_vr"
   }
-  builder_view_only: true
 }
 
 consoles {
-  header_id: "chromium"
   id: "tryserver.chromium.mac"
   name: "tryserver.chromium.mac"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "refs/heads/master"
-  manifest_name: "REVISION"
+  builder_view_only: true
   builders {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-mac-amd-dqp"
   }
@@ -4540,9 +4513,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/mac_chromium_10.10"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/mac_chromium_10.10_macviews"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/mac_chromium_10.12_rel_ng"
   }
@@ -4564,25 +4534,18 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/mac_chromium_dbg_ng"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/mac_chromium_10.13_rel_ng"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/mac_optional_gpu_tests_rel"
   }
   builders {
     name: "buildbucket/luci.chromium.try/mac_upload_clang"
   }
-  builder_view_only: true
 }
 
 consoles {
-  header_id: "chromium"
   id: "tryserver.chromium.win"
   name: "tryserver.chromium.win"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "refs/heads/master"
-  manifest_name: "REVISION"
+  builder_view_only: true
   builders {
     name: "buildbucket/luci.chromium.try/gpu-fyi-try-win-xr-builder-64"
   }
@@ -4673,16 +4636,12 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/win-annotator-rel"
   }
-  builder_view_only: true
 }
 
 consoles {
-  header_id: ""
   id: "tryserver.blink"
   name: "tryserver.blink"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "refs/heads/master"
-  manifest_name: "REVISION"
+  builder_view_only: true
   builders {
     name: "buildbucket/luci.chromium.try/linux-blink-rel"
   }
@@ -4707,16 +4666,12 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/win7-blink-rel"
   }
-  builder_view_only: true
 }
 
 consoles {
-  header_id: "chromium"
   id: "angle.try"
   name: "angle.try"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "refs/heads/master"
-  manifest_name: "REVISION"
+  builder_view_only: true
   builders {
     name: "buildbucket/luci.chromium.try/android_angle_deqp_rel_ng"
   }
@@ -4762,16 +4717,12 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/win-angle-rel-64"
   }
-  builder_view_only: true
 }
 
 consoles {
-  header_id: "chromium"
   id: "luci.chromium.try"
   name: "luci.chromium.try"
-  repo_url: "https://chromium.googlesource.com/chromium/src"
-  refs: "refs/heads/master"
-  manifest_name: "REVISION"
+  builder_view_only: true
   builders {
     name: "buildbucket/luci.chromium.try/android-cronet-arm-dbg"
   }
@@ -4784,9 +4735,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/android-marshmallow-arm64-rel"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/android-marshmallow-x64-fyi-rel"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/android-oreo-arm64-cts-networkservice-dbg"
   }
@@ -4889,9 +4837,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/closure_compilation"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/fuchsia"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/fuchsia-angle-rel"
   }
@@ -5138,9 +5083,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/linux_chromium_compile_rel_ng"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/linux_chromium_component_updater"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/linux-clang-tidy-dbg"
   }
@@ -5213,9 +5155,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/mac-rel"
   }
-  builders {
-    name: "buildbucket/luci.chromium.try/mac_chromium_10.10_macviews"
-  }
   builders {
     name: "buildbucket/luci.chromium.try/mac_chromium_10.10"
   }
@@ -5315,7 +5254,6 @@ consoles {
   builders {
     name: "buildbucket/luci.chromium.try/win-celab-try-rel"
   }
-  builder_view_only: true
 }
 
 consoles {