From c1bb56e730f1cf1495f249f50b298536a9999e3b Mon Sep 17 00:00:00 2001 From: "machenbach@chromium.org" Date: Tue, 1 Dec 2015 10:43:38 +0000 Subject: [PATCH] Roll CQ client changes 7d916d5..f59ed9f BUG=chromium:561530 Review URL: https://codereview.chromium.org/1490473004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297753 0039d316-1c4b-4281-b951-d872f2087c98 --- third_party/cq_client/cq.pb.go | 118 ++++++++++++++++----- third_party/cq_client/cq.proto | 7 +- third_party/cq_client/cq_pb2.py | 26 ++--- third_party/cq_client/test/cq_gerrit.cfg | 5 +- third_party/cq_client/test/cq_rietveld.cfg | 5 +- 5 files changed, 116 insertions(+), 45 deletions(-) diff --git a/third_party/cq_client/cq.pb.go b/third_party/cq_client/cq.pb.go index 7b1403fadf..1a0a440a47 100644 --- a/third_party/cq_client/cq.pb.go +++ b/third_party/cq_client/cq.pb.go @@ -71,9 +71,10 @@ type Config struct { XXX_unrecognized []byte `json:"-"` } -func (m *Config) Reset() { *m = Config{} } -func (m *Config) String() string { return proto.CompactTextString(m) } -func (*Config) ProtoMessage() {} +func (m *Config) Reset() { *m = Config{} } +func (m *Config) String() string { return proto.CompactTextString(m) } +func (*Config) ProtoMessage() {} +func (*Config) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } func (m *Config) GetVersion() int32 { if m != nil && m.Version != nil { @@ -178,9 +179,10 @@ type Rietveld struct { XXX_unrecognized []byte `json:"-"` } -func (m *Rietveld) Reset() { *m = Rietveld{} } -func (m *Rietveld) String() string { return proto.CompactTextString(m) } -func (*Rietveld) ProtoMessage() {} +func (m *Rietveld) Reset() { *m = Rietveld{} } +func (m *Rietveld) String() string { return proto.CompactTextString(m) } +func (*Rietveld) ProtoMessage() {} +func (*Rietveld) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } func (m *Rietveld) GetUrl() string { if m != nil && m.Url != nil { @@ -223,9 +225,10 @@ type Gerrit struct { XXX_unrecognized []byte `json:"-"` } -func (m *Gerrit) Reset() { *m = Gerrit{} } -func (m *Gerrit) String() string { return proto.CompactTextString(m) } -func (*Gerrit) ProtoMessage() {} +func (m *Gerrit) Reset() { *m = Gerrit{} } +func (m *Gerrit) String() string { return proto.CompactTextString(m) } +func (*Gerrit) ProtoMessage() {} +func (*Gerrit) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } func (m *Gerrit) GetCqVerifiedLabel() string { if m != nil && m.CqVerifiedLabel != nil { @@ -257,9 +260,10 @@ type Verifiers struct { XXX_unrecognized []byte `json:"-"` } -func (m *Verifiers) Reset() { *m = Verifiers{} } -func (m *Verifiers) String() string { return proto.CompactTextString(m) } -func (*Verifiers) ProtoMessage() {} +func (m *Verifiers) Reset() { *m = Verifiers{} } +func (m *Verifiers) String() string { return proto.CompactTextString(m) } +func (*Verifiers) ProtoMessage() {} +func (*Verifiers) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } func (m *Verifiers) GetReviewerLgtm() *Verifiers_ReviewerLgtmVerifier { if m != nil { @@ -312,6 +316,9 @@ type Verifiers_ReviewerLgtmVerifier struct { func (m *Verifiers_ReviewerLgtmVerifier) Reset() { *m = Verifiers_ReviewerLgtmVerifier{} } func (m *Verifiers_ReviewerLgtmVerifier) String() string { return proto.CompactTextString(m) } func (*Verifiers_ReviewerLgtmVerifier) ProtoMessage() {} +func (*Verifiers_ReviewerLgtmVerifier) Descriptor() ([]byte, []int) { + return fileDescriptor0, []int{3, 0} +} func (m *Verifiers_ReviewerLgtmVerifier) GetCommitterList() string { if m != nil && m.CommitterList != nil { @@ -343,6 +350,9 @@ type Verifiers_TreeStatusLgtmVerifier struct { func (m *Verifiers_TreeStatusLgtmVerifier) Reset() { *m = Verifiers_TreeStatusLgtmVerifier{} } func (m *Verifiers_TreeStatusLgtmVerifier) String() string { return proto.CompactTextString(m) } func (*Verifiers_TreeStatusLgtmVerifier) ProtoMessage() {} +func (*Verifiers_TreeStatusLgtmVerifier) Descriptor() ([]byte, []int) { + return fileDescriptor0, []int{3, 1} +} func (m *Verifiers_TreeStatusLgtmVerifier) GetTreeStatusUrl() string { if m != nil && m.TreeStatusUrl != nil { @@ -360,9 +370,10 @@ type Verifiers_TryJobVerifier struct { XXX_unrecognized []byte `json:"-"` } -func (m *Verifiers_TryJobVerifier) Reset() { *m = Verifiers_TryJobVerifier{} } -func (m *Verifiers_TryJobVerifier) String() string { return proto.CompactTextString(m) } -func (*Verifiers_TryJobVerifier) ProtoMessage() {} +func (m *Verifiers_TryJobVerifier) Reset() { *m = Verifiers_TryJobVerifier{} } +func (m *Verifiers_TryJobVerifier) String() string { return proto.CompactTextString(m) } +func (*Verifiers_TryJobVerifier) ProtoMessage() {} +func (*Verifiers_TryJobVerifier) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3, 2} } func (m *Verifiers_TryJobVerifier) GetBuckets() []*Verifiers_TryJobVerifier_Bucket { if m != nil { @@ -381,9 +392,10 @@ func (m *Verifiers_TryJobVerifier) GetTryJobRetryConfig() *Verifiers_TryJobVerif type Verifiers_TryJobVerifier_Builder struct { // Name of the builder. Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` - // When true, the builder is triggered by CQ. Otherwise, it is expected to - // be triggered from another tryjob. Default value is true. - TriggeredByCq *bool `protobuf:"varint,2,opt,name=triggered_by_cq" json:"triggered_by_cq,omitempty"` + // Optionally specify a builder name that triggers the given builder. + // Otherwise, CQ will trigger this builder (default). If in doubt, you + // probably won't need this. + TriggeredBy *string `protobuf:"bytes,2,opt,name=triggered_by" json:"triggered_by,omitempty"` // When this field is present, it marks given builder as experimental. It // is only executed on a given percentage of the CLs and the outcome does // not affect the decicion whether a CL can land or not. This is typically @@ -395,6 +407,9 @@ type Verifiers_TryJobVerifier_Builder struct { func (m *Verifiers_TryJobVerifier_Builder) Reset() { *m = Verifiers_TryJobVerifier_Builder{} } func (m *Verifiers_TryJobVerifier_Builder) String() string { return proto.CompactTextString(m) } func (*Verifiers_TryJobVerifier_Builder) ProtoMessage() {} +func (*Verifiers_TryJobVerifier_Builder) Descriptor() ([]byte, []int) { + return fileDescriptor0, []int{3, 2, 0} +} func (m *Verifiers_TryJobVerifier_Builder) GetName() string { if m != nil && m.Name != nil { @@ -403,11 +418,11 @@ func (m *Verifiers_TryJobVerifier_Builder) GetName() string { return "" } -func (m *Verifiers_TryJobVerifier_Builder) GetTriggeredByCq() bool { - if m != nil && m.TriggeredByCq != nil { - return *m.TriggeredByCq +func (m *Verifiers_TryJobVerifier_Builder) GetTriggeredBy() string { + if m != nil && m.TriggeredBy != nil { + return *m.TriggeredBy } - return false + return "" } func (m *Verifiers_TryJobVerifier_Builder) GetExperimentPercentage() float32 { @@ -430,6 +445,9 @@ type Verifiers_TryJobVerifier_Bucket struct { func (m *Verifiers_TryJobVerifier_Bucket) Reset() { *m = Verifiers_TryJobVerifier_Bucket{} } func (m *Verifiers_TryJobVerifier_Bucket) String() string { return proto.CompactTextString(m) } func (*Verifiers_TryJobVerifier_Bucket) ProtoMessage() {} +func (*Verifiers_TryJobVerifier_Bucket) Descriptor() ([]byte, []int) { + return fileDescriptor0, []int{3, 2, 1} +} func (m *Verifiers_TryJobVerifier_Bucket) GetName() string { if m != nil && m.Name != nil { @@ -466,6 +484,9 @@ func (m *Verifiers_TryJobVerifier_TryJobRetryConfig) String() string { return proto.CompactTextString(m) } func (*Verifiers_TryJobVerifier_TryJobRetryConfig) ProtoMessage() {} +func (*Verifiers_TryJobVerifier_TryJobRetryConfig) Descriptor() ([]byte, []int) { + return fileDescriptor0, []int{3, 2, 2} +} func (m *Verifiers_TryJobVerifier_TryJobRetryConfig) GetTryJobRetryQuota() int32 { if m != nil && m.TryJobRetryQuota != nil { @@ -506,9 +527,10 @@ type Verifiers_SignCLAVerifier struct { XXX_unrecognized []byte `json:"-"` } -func (m *Verifiers_SignCLAVerifier) Reset() { *m = Verifiers_SignCLAVerifier{} } -func (m *Verifiers_SignCLAVerifier) String() string { return proto.CompactTextString(m) } -func (*Verifiers_SignCLAVerifier) ProtoMessage() {} +func (m *Verifiers_SignCLAVerifier) Reset() { *m = Verifiers_SignCLAVerifier{} } +func (m *Verifiers_SignCLAVerifier) String() string { return proto.CompactTextString(m) } +func (*Verifiers_SignCLAVerifier) ProtoMessage() {} +func (*Verifiers_SignCLAVerifier) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3, 3} } func init() { proto.RegisterType((*Config)(nil), "Config") @@ -523,3 +545,49 @@ func init() { proto.RegisterType((*Verifiers_TryJobVerifier_TryJobRetryConfig)(nil), "Verifiers.TryJobVerifier.TryJobRetryConfig") proto.RegisterType((*Verifiers_SignCLAVerifier)(nil), "Verifiers.SignCLAVerifier") } + +var fileDescriptor0 = []byte{ + // 660 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x54, 0xdd, 0x4e, 0xdb, 0x4c, + 0x10, 0x55, 0x08, 0x49, 0x9c, 0x31, 0x90, 0x0f, 0x13, 0xc0, 0xf8, 0xeb, 0x0f, 0x50, 0xa9, 0xaa, + 0xda, 0xca, 0x12, 0xa9, 0xd4, 0xfb, 0xc2, 0x45, 0xd5, 0x96, 0x2b, 0xa8, 0x7a, 0xd1, 0x9b, 0xd5, + 0xda, 0x9e, 0x98, 0xa5, 0xfe, 0x81, 0xf5, 0x3a, 0x90, 0xb7, 0xea, 0x53, 0xf4, 0x11, 0x7a, 0xd5, + 0x87, 0xe9, 0x78, 0xbd, 0x09, 0x71, 0x4a, 0xae, 0x6c, 0xcf, 0x39, 0xb3, 0x7b, 0x66, 0xce, 0x8c, + 0xc1, 0x0a, 0x6f, 0xfd, 0x1b, 0x99, 0xab, 0xfc, 0xf8, 0xd7, 0x1a, 0x74, 0xcf, 0xf2, 0x6c, 0x2c, + 0x62, 0x67, 0x00, 0xbd, 0x09, 0xca, 0x42, 0xe4, 0x99, 0xdb, 0x3a, 0x6c, 0xbd, 0xea, 0x54, 0x81, + 0xf0, 0x96, 0x65, 0x3c, 0x45, 0x77, 0x8d, 0x02, 0x7d, 0xe7, 0x29, 0xf4, 0x89, 0x21, 0xc6, 0x82, + 0x68, 0x6e, 0x9b, 0x42, 0xf6, 0x08, 0xfc, 0x6f, 0xb3, 0x88, 0xb3, 0x0b, 0x9b, 0xc4, 0x2f, 0x14, + 0x57, 0x65, 0xc1, 0x4a, 0x99, 0xb8, 0xeb, 0x3a, 0xeb, 0x08, 0x0e, 0xae, 0x44, 0x84, 0x4c, 0xe2, + 0x98, 0x89, 0x8c, 0x85, 0x79, 0x9a, 0x0a, 0xa5, 0x30, 0x62, 0x69, 0x11, 0xbb, 0x1d, 0xa2, 0x58, + 0x8e, 0x07, 0x4e, 0x1d, 0x66, 0x41, 0x29, 0x0b, 0xc5, 0x22, 0x4c, 0xf8, 0xd4, 0xed, 0x6a, 0x15, + 0x2e, 0xfc, 0x97, 0xf2, 0x7b, 0xb6, 0x88, 0xbb, 0x3d, 0x8d, 0xd0, 0x7d, 0x74, 0x1e, 0xd5, 0x11, + 0x95, 0xa1, 0xaa, 0x64, 0x5b, 0xfa, 0xb0, 0xff, 0xc1, 0x92, 0x02, 0xd5, 0x04, 0x93, 0xc8, 0xed, + 0x6b, 0x91, 0x7d, 0xff, 0xc2, 0x04, 0x9c, 0x7d, 0xe8, 0xc6, 0x28, 0xa5, 0x50, 0xee, 0x40, 0x43, + 0x3d, 0xff, 0xa3, 0xfe, 0x74, 0x86, 0xb0, 0x11, 0xd3, 0xf9, 0x12, 0x6f, 0x72, 0xad, 0x1d, 0xb4, + 0x76, 0x07, 0x40, 0x71, 0x19, 0x63, 0x05, 0x8c, 0x5d, 0x5b, 0xc7, 0x88, 0x59, 0x4c, 0xb2, 0x07, + 0xe6, 0x46, 0x15, 0x3d, 0xf6, 0xc1, 0x9a, 0x5f, 0x62, 0x43, 0xbb, 0x02, 0x5a, 0x9a, 0x4e, 0x2a, + 0x49, 0xe2, 0x35, 0x86, 0x24, 0x9e, 0x17, 0x58, 0x50, 0x2f, 0xdb, 0xc4, 0x7f, 0x01, 0x5d, 0x73, + 0xf3, 0x01, 0x6c, 0x53, 0xdb, 0x4c, 0x63, 0x23, 0x96, 0xf0, 0x00, 0x4d, 0xee, 0xf1, 0xef, 0x2e, + 0xf4, 0x1f, 0xfa, 0xfb, 0x1e, 0x36, 0x25, 0x4e, 0x04, 0xde, 0xa1, 0x64, 0x49, 0xac, 0x52, 0x4d, + 0xb2, 0x47, 0xcf, 0x1f, 0x2c, 0xf0, 0x2f, 0x0c, 0x7e, 0x4e, 0xf0, 0x2c, 0x4a, 0x79, 0xb6, 0x92, + 0x88, 0xc6, 0x19, 0xed, 0xa5, 0x3d, 0x3a, 0x5a, 0xc8, 0xfa, 0x4a, 0xe8, 0xa5, 0x06, 0x1b, 0x79, + 0xaf, 0xa1, 0xa7, 0xe4, 0x94, 0x5d, 0xe7, 0x81, 0x31, 0xfb, 0xa0, 0x91, 0x33, 0xfd, 0x9c, 0x07, + 0x73, 0xee, 0x5b, 0xb0, 0x0a, 0x11, 0x93, 0xbb, 0x09, 0xd7, 0xb6, 0xdb, 0x23, 0x6f, 0x81, 0x7c, + 0x49, 0xd0, 0xd9, 0xf9, 0x87, 0x59, 0xc0, 0xfb, 0x0e, 0xc3, 0x47, 0x95, 0xee, 0xc1, 0xd6, 0x6c, + 0x3c, 0xa8, 0x44, 0x41, 0x4e, 0xcf, 0x7b, 0x58, 0xcd, 0xc0, 0x1d, 0x27, 0x87, 0x0a, 0x0c, 0xeb, + 0x1a, 0x3a, 0xce, 0x0e, 0xd8, 0x59, 0xae, 0x5b, 0xa1, 0x67, 0xa9, 0x12, 0xd9, 0xf7, 0x4e, 0x60, + 0x6f, 0x45, 0x3d, 0xfb, 0x30, 0x58, 0xe8, 0x03, 0x9b, 0x5b, 0xe4, 0xfd, 0x69, 0xc3, 0xd6, 0x52, + 0x3d, 0x27, 0xd0, 0x0b, 0xca, 0xf0, 0x07, 0xaa, 0x82, 0x38, 0x6d, 0x2a, 0xe7, 0x70, 0x65, 0xed, + 0xfe, 0xa9, 0x26, 0x3a, 0x9f, 0x60, 0x68, 0xda, 0x45, 0xb3, 0x51, 0xbd, 0x85, 0x7a, 0xaf, 0x4c, + 0xbf, 0xdf, 0xac, 0xce, 0xaf, 0x3f, 0x2f, 0xaa, 0x9c, 0x7a, 0x15, 0xbd, 0x73, 0xe8, 0x9d, 0x96, + 0x22, 0x89, 0x48, 0xc8, 0x06, 0xac, 0xeb, 0x0d, 0x6c, 0xcd, 0x66, 0x4f, 0x49, 0x11, 0xd3, 0x08, + 0xd3, 0xa4, 0x04, 0xd3, 0xf9, 0x5e, 0xee, 0xe2, 0xfd, 0x0d, 0x1d, 0x97, 0x62, 0xa6, 0x18, 0xbd, + 0x84, 0xf4, 0xe4, 0x31, 0x6a, 0x27, 0xd6, 0xbc, 0x2f, 0xd0, 0x35, 0x12, 0x9b, 0x87, 0xbd, 0x03, + 0x2b, 0xa8, 0x6f, 0xa9, 0x87, 0x72, 0x79, 0x28, 0x96, 0x8a, 0xd4, 0x4c, 0xef, 0x67, 0x0b, 0xb6, + 0xff, 0x11, 0x4c, 0x3b, 0xb7, 0xd3, 0xac, 0xfd, 0xb6, 0xcc, 0x15, 0x37, 0xff, 0x11, 0xda, 0xee, + 0x38, 0xc9, 0x03, 0x9e, 0x34, 0xb0, 0xda, 0xc2, 0x27, 0x30, 0x1c, 0x73, 0x91, 0x94, 0x12, 0x0d, + 0x78, 0x87, 0x22, 0xbe, 0x52, 0xda, 0xcb, 0x8e, 0xf3, 0x12, 0x9e, 0x29, 0xc9, 0xb3, 0x42, 0x54, + 0x75, 0x3d, 0xca, 0x5b, 0x9f, 0x9d, 0xa2, 0xa8, 0xf8, 0xbc, 0x54, 0x4d, 0xb4, 0xfa, 0xbb, 0x74, + 0xbc, 0x6d, 0x18, 0x2c, 0x0d, 0xe0, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0e, 0x52, 0xce, 0xf8, + 0x01, 0x05, 0x00, 0x00, +} diff --git a/third_party/cq_client/cq.proto b/third_party/cq_client/cq.proto index dcef0fbf82..56aab38724 100644 --- a/third_party/cq_client/cq.proto +++ b/third_party/cq_client/cq.proto @@ -150,9 +150,10 @@ message Verifiers { // Name of the builder. optional string name = 1; - // When true, the builder is triggered by CQ. Otherwise, it is expected to - // be triggered from another tryjob. Default value is true. - optional bool triggered_by_cq = 2; + // Optionally specify a builder name that triggers the given builder. + // Otherwise, CQ will trigger this builder (default). If in doubt, you + // probably won't need this. + optional string triggered_by = 2; // When this field is present, it marks given builder as experimental. It // is only executed on a given percentage of the CLs and the outcome does diff --git a/third_party/cq_client/cq_pb2.py b/third_party/cq_client/cq_pb2.py index 99e056fb3c..770bd29de7 100644 --- a/third_party/cq_client/cq_pb2.py +++ b/third_party/cq_client/cq_pb2.py @@ -26,7 +26,7 @@ _sym_db = _symbol_database.Default() DESCRIPTOR = _descriptor.FileDescriptor( name='cq.proto', package='', - serialized_pb=_b('\n\x08\x63q.proto\"\xc6\x02\n\x06\x43onfig\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\x0f\n\x07\x63q_name\x18\x02 \x01(\t\x12\x1d\n\tverifiers\x18\x03 \x01(\x0b\x32\n.Verifiers\x12\x15\n\rcq_status_url\x18\x04 \x01(\t\x12!\n\x19hide_ref_in_committed_msg\x18\x05 \x01(\x08\x12\x1a\n\x12\x63ommit_burst_delay\x18\x06 \x01(\x05\x12\x18\n\x10max_commit_burst\x18\x07 \x01(\x05\x12\x15\n\rin_production\x18\x08 \x01(\x08\x12\x1b\n\x08rietveld\x18\t \x01(\x0b\x32\t.Rietveld\x12\x17\n\x06gerrit\x18\x0f \x01(\x0b\x32\x07.Gerrit\x12\x14\n\x0cgit_repo_url\x18\n \x01(\t\x12\x12\n\ntarget_ref\x18\x0b \x01(\t\x12\x14\n\x0csvn_repo_url\x18\x0c \x01(\t\".\n\x08Rietveld\x12\x0b\n\x03url\x18\x01 \x01(\t\x12\x15\n\rproject_bases\x18\x02 \x03(\t\"#\n\x06Gerrit\x12\x19\n\x11\x63q_verified_label\x18\x01 \x01(\t\"\xd9\x06\n\tVerifiers\x12\x36\n\rreviewer_lgtm\x18\x01 \x01(\x0b\x32\x1f.Verifiers.ReviewerLgtmVerifier\x12\x36\n\x0btree_status\x18\x02 \x01(\x0b\x32!.Verifiers.TreeStatusLgtmVerifier\x12*\n\x07try_job\x18\x03 \x01(\x0b\x32\x19.Verifiers.TryJobVerifier\x12,\n\x08sign_cla\x18\x04 \x01(\x0b\x32\x1a.Verifiers.SignCLAVerifier\x1aZ\n\x14ReviewerLgtmVerifier\x12\x16\n\x0e\x63ommitter_list\x18\x01 \x01(\t\x12\x15\n\rmax_wait_secs\x18\x02 \x01(\x05\x12\x13\n\x0bno_lgtm_msg\x18\x03 \x01(\t\x1a\x31\n\x16TreeStatusLgtmVerifier\x12\x17\n\x0ftree_status_url\x18\x01 \x01(\t\x1a\xdf\x03\n\x0eTryJobVerifier\x12\x31\n\x07\x62uckets\x18\x01 \x03(\x0b\x32 .Verifiers.TryJobVerifier.Bucket\x12I\n\x14try_job_retry_config\x18\x02 \x01(\x0b\x32+.Verifiers.TryJobVerifier.TryJobRetryConfig\x1aO\n\x07\x42uilder\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x17\n\x0ftriggered_by_cq\x18\x02 \x01(\x08\x12\x1d\n\x15\x65xperiment_percentage\x18\x04 \x01(\x02\x1aK\n\x06\x42ucket\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x33\n\x08\x62uilders\x18\x02 \x03(\x0b\x32!.Verifiers.TryJobVerifier.Builder\x1a\xb0\x01\n\x11TryJobRetryConfig\x12\x1b\n\x13try_job_retry_quota\x18\x01 \x01(\x05\x12\x1a\n\x12global_retry_quota\x18\x02 \x01(\x05\x12\x1c\n\x14\x66\x61ilure_retry_weight\x18\x03 \x01(\x05\x12&\n\x1etransient_failure_retry_weight\x18\x04 \x01(\x05\x12\x1c\n\x14timeout_retry_weight\x18\x05 \x01(\x05\x1a\x11\n\x0fSignCLAVerifier') + serialized_pb=_b('\n\x08\x63q.proto\"\xc6\x02\n\x06\x43onfig\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\x0f\n\x07\x63q_name\x18\x02 \x01(\t\x12\x1d\n\tverifiers\x18\x03 \x01(\x0b\x32\n.Verifiers\x12\x15\n\rcq_status_url\x18\x04 \x01(\t\x12!\n\x19hide_ref_in_committed_msg\x18\x05 \x01(\x08\x12\x1a\n\x12\x63ommit_burst_delay\x18\x06 \x01(\x05\x12\x18\n\x10max_commit_burst\x18\x07 \x01(\x05\x12\x15\n\rin_production\x18\x08 \x01(\x08\x12\x1b\n\x08rietveld\x18\t \x01(\x0b\x32\t.Rietveld\x12\x17\n\x06gerrit\x18\x0f \x01(\x0b\x32\x07.Gerrit\x12\x14\n\x0cgit_repo_url\x18\n \x01(\t\x12\x12\n\ntarget_ref\x18\x0b \x01(\t\x12\x14\n\x0csvn_repo_url\x18\x0c \x01(\t\".\n\x08Rietveld\x12\x0b\n\x03url\x18\x01 \x01(\t\x12\x15\n\rproject_bases\x18\x02 \x03(\t\"#\n\x06Gerrit\x12\x19\n\x11\x63q_verified_label\x18\x01 \x01(\t\"\xd6\x06\n\tVerifiers\x12\x36\n\rreviewer_lgtm\x18\x01 \x01(\x0b\x32\x1f.Verifiers.ReviewerLgtmVerifier\x12\x36\n\x0btree_status\x18\x02 \x01(\x0b\x32!.Verifiers.TreeStatusLgtmVerifier\x12*\n\x07try_job\x18\x03 \x01(\x0b\x32\x19.Verifiers.TryJobVerifier\x12,\n\x08sign_cla\x18\x04 \x01(\x0b\x32\x1a.Verifiers.SignCLAVerifier\x1aZ\n\x14ReviewerLgtmVerifier\x12\x16\n\x0e\x63ommitter_list\x18\x01 \x01(\t\x12\x15\n\rmax_wait_secs\x18\x02 \x01(\x05\x12\x13\n\x0bno_lgtm_msg\x18\x03 \x01(\t\x1a\x31\n\x16TreeStatusLgtmVerifier\x12\x17\n\x0ftree_status_url\x18\x01 \x01(\t\x1a\xdc\x03\n\x0eTryJobVerifier\x12\x31\n\x07\x62uckets\x18\x01 \x03(\x0b\x32 .Verifiers.TryJobVerifier.Bucket\x12I\n\x14try_job_retry_config\x18\x02 \x01(\x0b\x32+.Verifiers.TryJobVerifier.TryJobRetryConfig\x1aL\n\x07\x42uilder\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x14\n\x0ctriggered_by\x18\x02 \x01(\t\x12\x1d\n\x15\x65xperiment_percentage\x18\x04 \x01(\x02\x1aK\n\x06\x42ucket\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x33\n\x08\x62uilders\x18\x02 \x03(\x0b\x32!.Verifiers.TryJobVerifier.Builder\x1a\xb0\x01\n\x11TryJobRetryConfig\x12\x1b\n\x13try_job_retry_quota\x18\x01 \x01(\x05\x12\x1a\n\x12global_retry_quota\x18\x02 \x01(\x05\x12\x1c\n\x14\x66\x61ilure_retry_weight\x18\x03 \x01(\x05\x12&\n\x1etransient_failure_retry_weight\x18\x04 \x01(\x05\x12\x1c\n\x14timeout_retry_weight\x18\x05 \x01(\x05\x1a\x11\n\x0fSignCLAVerifier') ) _sym_db.RegisterFileDescriptor(DESCRIPTOR) @@ -301,9 +301,9 @@ _VERIFIERS_TRYJOBVERIFIER_BUILDER = _descriptor.Descriptor( is_extension=False, extension_scope=None, options=None), _descriptor.FieldDescriptor( - name='triggered_by_cq', full_name='Verifiers.TryJobVerifier.Builder.triggered_by_cq', index=1, - number=2, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, + name='triggered_by', full_name='Verifiers.TryJobVerifier.Builder.triggered_by', index=1, + number=2, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, options=None), @@ -326,7 +326,7 @@ _VERIFIERS_TRYJOBVERIFIER_BUILDER = _descriptor.Descriptor( oneofs=[ ], serialized_start=930, - serialized_end=1009, + serialized_end=1006, ) _VERIFIERS_TRYJOBVERIFIER_BUCKET = _descriptor.Descriptor( @@ -361,8 +361,8 @@ _VERIFIERS_TRYJOBVERIFIER_BUCKET = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1011, - serialized_end=1086, + serialized_start=1008, + serialized_end=1083, ) _VERIFIERS_TRYJOBVERIFIER_TRYJOBRETRYCONFIG = _descriptor.Descriptor( @@ -418,8 +418,8 @@ _VERIFIERS_TRYJOBVERIFIER_TRYJOBRETRYCONFIG = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1089, - serialized_end=1265, + serialized_start=1086, + serialized_end=1262, ) _VERIFIERS_TRYJOBVERIFIER = _descriptor.Descriptor( @@ -455,7 +455,7 @@ _VERIFIERS_TRYJOBVERIFIER = _descriptor.Descriptor( oneofs=[ ], serialized_start=786, - serialized_end=1265, + serialized_end=1262, ) _VERIFIERS_SIGNCLAVERIFIER = _descriptor.Descriptor( @@ -476,8 +476,8 @@ _VERIFIERS_SIGNCLAVERIFIER = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1267, - serialized_end=1284, + serialized_start=1264, + serialized_end=1281, ) _VERIFIERS = _descriptor.Descriptor( @@ -527,7 +527,7 @@ _VERIFIERS = _descriptor.Descriptor( oneofs=[ ], serialized_start=427, - serialized_end=1284, + serialized_end=1281, ) _CONFIG.fields_by_name['verifiers'].message_type = _VERIFIERS diff --git a/third_party/cq_client/test/cq_gerrit.cfg b/third_party/cq_client/test/cq_gerrit.cfg index 7aa97bff33..1d59227304 100644 --- a/third_party/cq_client/test/cq_gerrit.cfg +++ b/third_party/cq_client/test/cq_gerrit.cfg @@ -22,9 +22,10 @@ verifiers { name: "tryserver.blink" builders { name: "android_blink_compile_dbg" } builders { name: "android_blink_compile_rel" } + builders { name: "win_blink_rel" } builders { - name: "win_blink_rel" - triggered_by_cq: false + name: "win_blink_rel_triggered" + triggered_by: "win_blink_rel" } } buckets { diff --git a/third_party/cq_client/test/cq_rietveld.cfg b/third_party/cq_client/test/cq_rietveld.cfg index 65380abd1a..dd7307c24d 100644 --- a/third_party/cq_client/test/cq_rietveld.cfg +++ b/third_party/cq_client/test/cq_rietveld.cfg @@ -29,9 +29,10 @@ verifiers { name: "tryserver.blink" builders { name: "android_blink_compile_dbg" } builders { name: "android_blink_compile_rel" } + builders { name: "win_blink_rel" } builders { - name: "win_blink_rel" - triggered_by_cq: false + name: "win_blink_rel_triggered" + triggered_by: "win_blink_rel" } } buckets {