Update CQ proto to latest version

Bug:
Change-Id: Iefa3a7bd449dfbe29450597d4ead73626c5315b1
Reviewed-on: https://chromium-review.googlesource.com/636167
Commit-Queue: Michael Knyszek <mknyszek@google.com>
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>

commit_queue.py

@@ -23,7 +23,7 @@ import rietveld
 THIRD_PARTY_DIR = os.path.join(os.path.dirname(__file__), 'third_party')
 sys.path.insert(0, THIRD_PARTY_DIR)
 
-from cq_client import cq_pb2
+from cq_client.v1 import cq_pb2
 from protobuf26 import text_format
 
 def usage(more):

third_party/cq_client/README.depot_tools.md

 Import of CQ protobuf config from infra_internal repo.
-Version: fde09c7a7b5e47b94a6aeffa24c8f339df0517a8 from Dec 19, 2016.
+Version: 614723941add42edbe1c8d5a04658967f15d2645 from Aug 18, 2017.

third_party/cq_client/v1/__init__.py

+# Copyright 2015 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.

third_party/cq_client/cq.proto → third_party/cq_client/v1/cq.proto

@@ -57,6 +57,7 @@ message Config {
   // time is >= this time.
   //
   // This is an UTC RFC3339 (stiptime(tm)) string representing the time.
+  // For example, "2017-12-23T15:47:58Z" and Z is required.
   optional string draining_start_time = 13;
 }
 
@@ -71,6 +72,7 @@ message Rietveld {
 // Unlike Rietveld, Gerrit doesn't need a separate url.
 // Instead, the git_repo_url must be specified on the Gerrit instance,
 // and CQ will deduce Gerrit url from it.
+// Also, gerrit_cq_ability verifier must be defined in case of Gerrit.
 //
 // For example, if https://chromium.googlesource.com/infra/infra.git is your
 // repo url provided in `git_repo_url` above, then
@@ -115,6 +117,7 @@ message Verifiers {
   //  * membership of the user in committers & dryrunners group,
   //  * the state of CL/patchset on which CQ is triggered,
   //  * relationship of the user to the CL.
+  // This verifier must be specified for Gerrit.
   optional GerritCQAbilityVerifier gerrit_cq_ability = 5;
 
   // This verifier is used to check tree status before committing a CL. If the
@@ -165,6 +168,19 @@ message Verifiers {
     // hasn't been approved.
     // This is usually the same group as tryjob-access.
     optional string dry_run_access_list = 4;
+
+    // Optional. allow_submit_with_open_deps controls how CQ full run behaves
+    // when current Gerrit CL has open dependencies (not yet submitted CLs on
+    // which *this* CL depends).
+    //
+    // If set to false (default), CQ will abort full run attempt immediately if
+    // open dependencies are detected.
+    //
+    // If set to true, then CQ will not abort full run and upon passing all
+    // other verifiers, CQ will attempt to submit the CL regardless of open
+    // dependencies. In turn, if Gerrit project config allows this, Gerrit will
+    // execute submit all dependent CLs first and then this CL.
+    optional bool allow_submit_with_open_deps = 5;
   }
 
   message TreeStatusLgtmVerifier {
@@ -173,6 +189,34 @@ message Verifiers {
   }
 
   message TryJobVerifier {
+    message EquivalentBuilder {
+      // Required. Bucket name of this builder.
+      optional string bucket = 1;
+      // Required. Name of this builder.
+      optional string builder = 2;
+      // Percentage expressing probability of CQ requiring this builder
+      // instead of the builder to which this builder is equilvanet to.
+      //
+      // If not specified, defaults to 50.
+      //
+      // A choice itself is made deterministicly based on CL alone, hereby
+      // all CQ attempts on all patchsets of a given CL will require the same
+      // builder, assuming CQ config doesn't change in the mean time.
+      //
+      // Note that if `owner_whitelist_group` is also specified, the choice over
+      // two builders will be made only for CLs owned by whitelisted group.
+      //
+      // To illustrate, suppose percentage=10. Then,
+      //   Without owner_whitelist_group,
+      //      ~10% of all CQ attempts will choose this builder.
+      //   With owner_whitelist_group set and, suppose, 1/5 of CQ attempts are
+      //      ran on CLs owned by this group, then only ~(1/10)*(1/5) or
+      //      ~2% of all CQ attempts will choose this builder.
+      optional int32 percentage = 3;
+      // If not specified, limits the builder to CL owners in this group.
+      optional string owner_whitelist_group = 4;
+    }
+
     message Builder {
       // Name of the builder.
       optional string name = 1;
@@ -187,6 +231,15 @@ message Verifiers {
       // not affect the decicion whether a CL can land or not. This is typically
       // used to test new builders and estimate their capacity requirements.
       optional float experiment_percentage = 4;
+
+      // Optionally specified alternative builder for CQ to choose instead.
+      // If provided, CQ will choose only one of the equivalent builders as
+      // required based purely on given CL and CL's owner and **regardless** of
+      // the possibly already completed try jobs.
+      //
+      // Note: none of the equivalent builders should be part of triggered_by
+      //  chain, although CQ may eventually relax this requirement somewhat.
+      optional EquivalentBuilder equivalent_to = 5;
     }
 
     message Bucket {

third_party/cq_client/testdata/cq_both.cfg → third_party/cq_client/v1/testdata/cq_both.cfg

@@ -10,7 +10,6 @@ rietveld {
   url: "https://codereview.chromium.org"
 }
 
-
 gerrit {
   cq_verified_label: "Commit-Queue-Verified"
 }
@@ -19,14 +18,19 @@ verifiers {
 
   # This verifier is not supported in Gerrit, and is just ignored.
   reviewer_lgtm: {
-     committer_list: "project-chromium-committers"
-     dry_run_access_list: "project-chromium-tryjob-access"
-     max_wait_secs: 600
-     no_lgtm_msg: "LGTM is missing"
+    committer_list: "project-chromium-committers"
+    dry_run_access_list: "project-chromium-tryjob-access"
+    max_wait_secs: 600
+    no_lgtm_msg: "LGTM is missing"
+  }
+
+  # This verifier is not supported in Rietveld, and is just ignored.
+  gerrit_cq_ability {
+    committer_list: "committer_list"
   }
 
   tree_status: {
-     tree_status_url: "https://infra-status.appspot.com"
+    tree_status_url: "https://infra-status.appspot.com"
   }
 
   try_job {

third_party/cq_client/testdata/cq_gerrit.cfg → third_party/cq_client/v1/testdata/cq_gerrit.cfg

@@ -13,7 +13,11 @@ gerrit {
 
 verifiers {
   tree_status: {
-     tree_status_url: "https://infra-status.appspot.com"
+    tree_status_url: "https://infra-status.appspot.com"
+  }
+
+  gerrit_cq_ability {
+    committer_list: "committer_list"
   }
 
   try_job {

third_party/cq_client/v2/__init__.py

+# Copyright 2017 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.