BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 45 insertions, 7 deletions

diff --git a/chromium/infra/config/project.star b/chromium/infra/config/project.star
index 29bb78c135b..ccbbfdf6f94 100644
--- a/chromium/infra/config/project.star
+++ b/chromium/infra/config/project.star
@@ -1,18 +1,56 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
 settings = struct(
-    is_master = False,
-    ref = 'refs/branch-heads/4147',
+    # Switch this to False for branches
+    is_master = True,
+    ref = 'refs/heads/master',
     ci_bucket = 'ci',
-    ci_poller = 'chromium-trigger',
+    ci_poller = 'master-gitiles-trigger',
     main_console_name = 'main',
-    main_console_title = 'M84 Main Console',
+    main_console_title = 'Chromium Main Console',
+    cq_mirrors_console_name = 'mirrors',
+    cq_mirrors_console_title = 'Chromium CQ Mirrors Console',
     try_bucket = 'try',
+    try_triggering_projects = ['angle', 'dawn', 'skia', 'v8'],
     cq_group = 'cq',
-    cq_ref_regexp = 'refs/branch-heads/4147',
+    cq_ref_regexp = 'refs/heads/.+',
     main_list_view_name = 'try',
-    main_list_view_title = 'M84 CQ console',
-    tree_status_host = None,
+    main_list_view_title = 'Chromium CQ console',
+    # Switch this to None for branches
+    tree_status_host = 'chromium-status.appspot.com/',
 )
 
+
+def _generate_project_pyl(ctx):
+  ctx.output['project.pyl'] = '\n'.join([
+      '# This is a non-LUCI generated file',
+      '# This is consumed by presubmit checks that need to validate the config',
+      repr(dict(
+          # On master, we want to ensure that we don't have source side specs
+          # defined for non-existent builders
+          # On branches, we don't want to re-generate the source side specs as
+          # that would increase branch day toil and complicate cherry-picks
+          validate_source_side_specs_have_builder = settings.is_master,
+      )),
+      '',
+  ])
+
+lucicfg.generator(_generate_project_pyl)
+
+
 def master_only_exec(f):
   if settings.is_master:
     exec(f)
+
+
+# The branch numbers of branches that we have builders running for (including
+# milestone-specific projects)
+# Branch numbers for milestones can be viewed in the chromium column at
+# https://chromiumdash.appspot.com/branches
+# The 2 highest milestones will be the ones with active branches
+ACTIVE_BRANCH_NUMBERS = [
+    4103,
+    4147,
+]