Added new config group for branch-heads.

Bug: 922150
Change-Id: I6df27b4f41583f5231cca5a10277d6ce3bddaa3a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1769347Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Karen Qian <karenqian@google.com>
Cr-Commit-Position: refs/heads/master@{#690882}

infra/config/commit-queue.cfg

@@ -39,7 +39,6 @@ config_groups {
     projects {
       name: "chromium/src"
       ref_regexp: "refs/heads/.+"
-      ref_regexp: "refs/branch-heads/.+"
     }
   }
   verifiers {
@@ -375,5 +374,40 @@ config_groups {
   }
 }
 
+config_groups {
+  gerrit {
+    url: "https://chromium-review.googlesource.com"
+    projects {
+      name: "chromium/src"
+      ref_regexp: "refs/branch-heads/.+"
+    }
+  }
+  verifiers {
+    gerrit_cq_ability {
+      committer_list: "project-chromium-committers"
+      dry_run_access_list: "project-chromium-tryjob-access"
+    }
+    tree_status {
+      url: "https://chromium-status.appspot.com/"
+    }
+    tryjob {
+      #############################
+      # Always required builders. #
+      #############################
+      builders {
+        name: "chromium/try/linux-rel"
+      }
+
+      retry_config {
+        single_quota: 1
+        global_quota: 2
+        failure_weight: 1
+        transient_failure_weight: 1
+        timeout_weight: 2
+      }
+    }
+  }
+}
+
 # NOTE: To add a new builder to the commit queue, see
 # https://chromium.googlesource.com/chromium/src/+/HEAD/docs/infra/cq.md#how-do-i-add-a-new-builder-to-the-cq

infra/config/cq_cfg_presubmit.py

@@ -180,8 +180,8 @@ class CQConfig(object):
     parsed_value = parse_text_proto_message(lines)
 
     # Sanity check.
-    assert len(parsed_value['config_groups']) == 1, (
-        'Expected only one config group, found %d' % len(
+    assert len(parsed_value['config_groups']) == 2, (
+        'Expected only two config group, found %d' % len(
             parsed_value['config_groups']))
     grp = parsed_value['config_groups'][0]
     gerrit = grp['gerrit'][0]