Add manifest links and hack to index on revision.
R=hinoka@chromium.org
BUG=
Review-Url: https://codereview.chromium.org/2979283002
diff --git a/common/proto/milo/annotations.pb.go b/common/proto/milo/annotations.pb.go
index 233c477..ca1d8a7 100644
--- a/common/proto/milo/annotations.pb.go
+++ b/common/proto/milo/annotations.pb.go
@@ -179,6 +179,10 @@
// the component.
OtherLinks []*Link `protobuf:"bytes,23,rep,name=other_links,json=otherLinks" json:"other_links,omitempty"`
Property []*Step_Property `protobuf:"bytes,24,rep,name=property" json:"property,omitempty"`
+ // Maps the name of the Manifest, e.g. UNPATCHED, INFRA, etc. to the
+ // ManifestLink. This name will be used in the milo console definition to
+ // indicate which manifest data to sort the console view by.
+ SourceManifests map[string]*Step_ManifestLink `protobuf:"bytes,25,rep,name=source_manifests,json=sourceManifests" json:"source_manifests,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
}
func (m *Step) Reset() { *m = Step{} }
@@ -284,6 +288,13 @@
return nil
}
+func (m *Step) GetSourceManifests() map[string]*Step_ManifestLink {
+ if m != nil {
+ return m.SourceManifests
+ }
+ return nil
+}
+
// Command contains information about a command-line invocation.
type Step_Command struct {
// The command-line invocation, expressed as an argument vector.
@@ -505,6 +516,39 @@
return ""
}
+// Links to a recipe_engine.Manifest proto.
+type Step_ManifestLink struct {
+ // The fully qualified (logdog://) url of the Manifest proto. It's expected
+ // that this is a binary logdog stream consisting of exactly one Manifest
+ // proto.
+ Url string `protobuf:"bytes,1,opt,name=url" json:"url,omitempty"`
+ // The hash of the Manifest. Milo will use this as an optimization;
+ // Manifests will be interned once into Milo's datastore. Future hashes
+ // which match will not be loaded from the url, but will be assumed to be
+ // identical. If the sha256 doesn't match the data at the URL, Milo may
+ // render this build with the wrong manifest.
+ Sha256 string `protobuf:"bytes,2,opt,name=sha256" json:"sha256,omitempty"`
+}
+
+func (m *Step_ManifestLink) Reset() { *m = Step_ManifestLink{} }
+func (m *Step_ManifestLink) String() string { return proto.CompactTextString(m) }
+func (*Step_ManifestLink) ProtoMessage() {}
+func (*Step_ManifestLink) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 4} }
+
+func (m *Step_ManifestLink) GetUrl() string {
+ if m != nil {
+ return m.Url
+ }
+ return ""
+}
+
+func (m *Step_ManifestLink) GetSha256() string {
+ if m != nil {
+ return m.Sha256
+ }
+ return ""
+}
+
// A Link is an optional label followed by a typed link to an external
// resource.
type Link struct {
@@ -824,6 +868,7 @@
proto.RegisterType((*Step_Substep)(nil), "milo.Step.Substep")
proto.RegisterType((*Step_Progress)(nil), "milo.Step.Progress")
proto.RegisterType((*Step_Property)(nil), "milo.Step.Property")
+ proto.RegisterType((*Step_ManifestLink)(nil), "milo.Step.ManifestLink")
proto.RegisterType((*Link)(nil), "milo.Link")
proto.RegisterType((*LogdogStream)(nil), "milo.LogdogStream")
proto.RegisterType((*IsolateObject)(nil), "milo.IsolateObject")
@@ -837,67 +882,72 @@
}
var fileDescriptor0 = []byte{
- // 981 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0x5d, 0x6f, 0xe3, 0x44,
- 0x14, 0x8d, 0x63, 0x27, 0x6e, 0x6e, 0xd2, 0x62, 0x86, 0xb0, 0x98, 0x08, 0xd1, 0x10, 0x21, 0x51,
- 0xc1, 0xae, 0x83, 0xca, 0x4a, 0xb0, 0x1f, 0xac, 0x94, 0x4d, 0xdc, 0x4d, 0xa4, 0x6c, 0xb6, 0x9a,
- 0xb4, 0xd2, 0xf2, 0x14, 0x39, 0xf1, 0x24, 0x35, 0xb5, 0x3d, 0xc6, 0x1e, 0x97, 0xe6, 0xe7, 0xf0,
- 0x23, 0xf8, 0x6f, 0x3c, 0xf0, 0x80, 0xe6, 0xc3, 0x89, 0x0b, 0xed, 0xf2, 0x62, 0xcd, 0xb9, 0xf7,
- 0xdc, 0x99, 0xb9, 0x67, 0x8e, 0x67, 0xe0, 0xc5, 0x26, 0x60, 0x57, 0xf9, 0xd2, 0x59, 0xd1, 0xa8,
- 0x1f, 0xe6, 0xab, 0x40, 0x7c, 0x9e, 0x6c, 0x68, 0x7f, 0x45, 0xa3, 0x88, 0xc6, 0xfd, 0x24, 0xa5,
- 0x8c, 0xf6, 0xa3, 0x20, 0xa4, 0x7d, 0x2f, 0x8e, 0x29, 0xf3, 0x58, 0x40, 0xe3, 0xcc, 0x11, 0x61,
- 0x64, 0xf0, 0x78, 0xe7, 0x78, 0x43, 0xe9, 0x26, 0x24, 0x92, 0xba, 0xcc, 0xd7, 0x7d, 0x16, 0x44,
- 0x24, 0x63, 0x5e, 0x94, 0x48, 0x5a, 0xef, 0x2f, 0x0d, 0x8e, 0xce, 0xbc, 0x20, 0xcc, 0x53, 0x32,
- 0x22, 0xcc, 0x0b, 0xc2, 0x0c, 0x3d, 0x01, 0x83, 0x6d, 0x13, 0x62, 0x6b, 0x5d, 0xed, 0xe4, 0xe8,
- 0xf4, 0x73, 0x87, 0x4f, 0xe4, 0xdc, 0xe5, 0x38, 0x17, 0xdb, 0x84, 0x60, 0x41, 0x43, 0x08, 0x0c,
- 0x46, 0x6e, 0x99, 0x5d, 0xed, 0x6a, 0x27, 0x0d, 0x2c, 0xc6, 0xe8, 0x15, 0xb4, 0xd7, 0x5e, 0x10,
- 0x12, 0x7f, 0xe1, 0x47, 0x0b, 0x9f, 0x24, 0x24, 0xf6, 0x49, 0xbc, 0xda, 0xda, 0x7a, 0x57, 0x3f,
- 0x69, 0x9e, 0xb6, 0xe4, 0x94, 0xa3, 0xb7, 0xd3, 0x20, 0xbe, 0xc6, 0x48, 0x32, 0x47, 0xd1, 0x68,
- 0xc7, 0xeb, 0xad, 0xc0, 0xe0, 0x2b, 0xa0, 0x26, 0x98, 0x6f, 0xdc, 0x99, 0x8b, 0x07, 0x53, 0xab,
- 0x82, 0x0e, 0xa1, 0xe1, 0xbe, 0x1f, 0xba, 0xe7, 0x17, 0x93, 0x77, 0x33, 0x4b, 0x43, 0x0d, 0xa8,
- 0x4d, 0x66, 0x67, 0x78, 0x60, 0x55, 0x91, 0x0d, 0xed, 0xd1, 0xdb, 0xc5, 0xc8, 0x3d, 0x77, 0x67,
- 0x23, 0x77, 0x36, 0xfc, 0x65, 0x71, 0x36, 0x98, 0x4c, 0xdd, 0x91, 0xa5, 0xf3, 0x9a, 0xe1, 0x60,
- 0x36, 0x74, 0xa7, 0x1c, 0x1a, 0x7c, 0x3e, 0xf7, 0xfd, 0xf9, 0x04, 0xbb, 0x23, 0xab, 0xd6, 0xfb,
- 0xe3, 0x00, 0x8c, 0x39, 0x23, 0x09, 0xef, 0x20, 0xf6, 0x22, 0xd9, 0x70, 0x03, 0x8b, 0x31, 0x7a,
- 0x0c, 0x26, 0x57, 0xd9, 0x8b, 0x7d, 0xd1, 0x58, 0xf3, 0x14, 0xc9, 0x4d, 0xf3, 0x02, 0x67, 0x28,
- 0x33, 0xb8, 0xa0, 0xa0, 0xaf, 0xa1, 0x9e, 0x31, 0x8f, 0xe5, 0x99, 0xad, 0x0b, 0xd1, 0x5a, 0x05,
- 0x99, 0xc7, 0xb0, 0xca, 0xa1, 0x9f, 0xe1, 0xa3, 0xb5, 0x94, 0x71, 0xe1, 0x4b, 0x1d, 0x6d, 0x43,
- 0xcc, 0xdd, 0xbe, 0x4f, 0x63, 0x7c, 0xb4, 0xbe, 0x7b, 0x2e, 0x8f, 0xc1, 0xcc, 0xf2, 0x65, 0xc6,
- 0x48, 0x62, 0xd7, 0x84, 0x8e, 0xe5, 0x2d, 0xcd, 0x65, 0x06, 0x17, 0x14, 0xf4, 0x23, 0x1c, 0x66,
- 0xcc, 0xa7, 0x39, 0x5b, 0x64, 0x2c, 0x25, 0x5e, 0x64, 0xd7, 0xcb, 0x6d, 0x4c, 0xe9, 0xc6, 0xa7,
- 0x9b, 0xb9, 0xc8, 0xe0, 0x96, 0x24, 0x4a, 0xa4, 0x0a, 0x49, 0x9a, 0x16, 0x85, 0xe6, 0x07, 0x0b,
- 0x49, 0x9a, 0xaa, 0xc2, 0xa7, 0x60, 0x66, 0xcc, 0x4b, 0x19, 0xf1, 0xed, 0x03, 0x51, 0xd2, 0x71,
- 0xa4, 0xfb, 0x9c, 0xc2, 0x7d, 0xce, 0x45, 0xe1, 0x3e, 0x5c, 0x50, 0xd1, 0xf7, 0x50, 0xe3, 0xa7,
- 0xee, 0xdb, 0x8d, 0xff, 0xad, 0x91, 0xc4, 0x9d, 0xe1, 0xda, 0x5d, 0x7d, 0x67, 0xb8, 0x3e, 0x1c,
- 0x24, 0x29, 0xdd, 0xa4, 0x24, 0xcb, 0xec, 0x4f, 0xc5, 0x44, 0x9f, 0x94, 0xc4, 0x39, 0x57, 0x29,
- 0xbc, 0x23, 0xa1, 0x2f, 0xc1, 0x08, 0x83, 0xf8, 0xda, 0x7e, 0x24, 0xc8, 0xa0, 0x9a, 0xe3, 0x7e,
- 0x14, 0x71, 0xf4, 0x1d, 0x34, 0x29, 0xbb, 0x22, 0xe9, 0x82, 0xa3, 0xcc, 0xfe, 0x4c, 0x08, 0x5e,
- 0xa6, 0x81, 0x48, 0xf3, 0x61, 0xa6, 0x56, 0x4f, 0x48, 0xca, 0xb6, 0xb6, 0x2d, 0x98, 0xff, 0x5a,
- 0x5d, 0xa4, 0xf0, 0x8e, 0xd4, 0xf9, 0x53, 0x03, 0x53, 0x99, 0x08, 0x7d, 0x05, 0x2d, 0x65, 0x23,
- 0xbe, 0x16, 0x77, 0x21, 0x6f, 0xab, 0xa9, 0x62, 0xd3, 0x20, 0x26, 0xc8, 0x02, 0x7d, 0xf5, 0xbb,
- 0xaf, 0xfe, 0x30, 0x3e, 0x44, 0xcf, 0xc0, 0x24, 0xf1, 0x4d, 0x90, 0xd2, 0x58, 0xfd, 0x53, 0xc7,
- 0xff, 0xb5, 0xa7, 0xe3, 0x4a, 0x86, 0x1b, 0xb3, 0x74, 0x8b, 0x0b, 0x7e, 0xe7, 0x39, 0xb4, 0xca,
- 0x09, 0x3e, 0xf9, 0x35, 0xd9, 0x2a, 0xf3, 0xf3, 0x21, 0x6a, 0x43, 0xed, 0xc6, 0x0b, 0x73, 0xa2,
- 0x16, 0x94, 0xe0, 0x79, 0xf5, 0x27, 0xad, 0xb3, 0x05, 0x53, 0x19, 0x0d, 0x75, 0xc1, 0x10, 0x56,
- 0xd4, 0xca, 0x02, 0xf2, 0xe5, 0xc7, 0x15, 0x2c, 0x32, 0x68, 0x00, 0x1f, 0xef, 0xaf, 0xa5, 0xc2,
- 0x4c, 0xd5, 0x87, 0xcc, 0x34, 0xae, 0x60, 0x6b, 0x4f, 0x97, 0xb1, 0xd7, 0x8d, 0x9d, 0xe5, 0x3b,
- 0xaf, 0xe0, 0xa0, 0x38, 0x46, 0xbe, 0x41, 0x46, 0x99, 0x17, 0x8a, 0xc5, 0x6b, 0x58, 0x02, 0xf4,
- 0x05, 0x34, 0x56, 0x34, 0x4a, 0x42, 0xc2, 0x1d, 0x58, 0x15, 0x99, 0x7d, 0xa0, 0xf3, 0x54, 0xd4,
- 0x0b, 0xf9, 0xef, 0xfd, 0xe1, 0xef, 0x6d, 0xba, 0xf7, 0xb7, 0x06, 0x06, 0x3f, 0x63, 0x9e, 0x0e,
- 0xbd, 0x25, 0x09, 0x55, 0x8d, 0x04, 0xe8, 0x18, 0x9a, 0x5e, 0x18, 0x78, 0xd9, 0x42, 0xe6, 0x64,
- 0x29, 0x88, 0xd0, 0x54, 0x10, 0x10, 0xe8, 0x79, 0x1a, 0x8a, 0x5b, 0xa1, 0x31, 0xae, 0x60, 0x0e,
- 0xd0, 0x33, 0x38, 0x0c, 0x45, 0xe3, 0x85, 0x26, 0xc6, 0x07, 0x34, 0x69, 0x85, 0x25, 0x8c, 0x5e,
- 0xc2, 0x51, 0x90, 0xd1, 0xd0, 0x63, 0x64, 0x41, 0x97, 0xbf, 0x92, 0x15, 0xb3, 0x6b, 0x65, 0xb3,
- 0x4f, 0x64, 0xee, 0x9d, 0x48, 0x8d, 0x2b, 0xf8, 0x30, 0x28, 0x07, 0xd0, 0x37, 0x60, 0xfa, 0x91,
- 0x30, 0xb4, 0xba, 0x0c, 0xee, 0x5c, 0xc4, 0xe3, 0x0a, 0xae, 0xfb, 0x11, 0x1f, 0xbd, 0x36, 0x95,
- 0x16, 0x3d, 0x0c, 0xad, 0xf2, 0x7e, 0xd0, 0x23, 0xa8, 0x67, 0x24, 0xbd, 0x21, 0xa9, 0x92, 0x41,
- 0x21, 0x1e, 0x4f, 0x52, 0xb2, 0x0e, 0x6e, 0x95, 0x04, 0x0a, 0xed, 0x84, 0xd6, 0xf7, 0x42, 0xf7,
- 0x5e, 0xc0, 0xe1, 0x9d, 0x7d, 0x3e, 0x38, 0x29, 0x02, 0xe3, 0xca, 0xcb, 0xae, 0x8a, 0x87, 0x85,
- 0x8f, 0x7b, 0x31, 0xd4, 0xe5, 0x6e, 0x1f, 0xac, 0x6a, 0x43, 0xed, 0xb7, 0x9c, 0x64, 0xc5, 0x7b,
- 0x24, 0x01, 0xb2, 0xc1, 0xf4, 0x18, 0x23, 0x51, 0xc2, 0xc4, 0x5e, 0x74, 0x5c, 0x40, 0xee, 0x1a,
- 0x72, 0x4b, 0x56, 0x39, 0x77, 0x9d, 0x38, 0x09, 0x1d, 0xef, 0x03, 0xdf, 0xbe, 0x84, 0xba, 0xbc,
- 0xc4, 0xf9, 0xd3, 0x81, 0x2f, 0x67, 0xb3, 0xc9, 0xec, 0x8d, 0x55, 0xe1, 0x60, 0x7e, 0x39, 0x1c,
- 0xba, 0xf3, 0xb9, 0xa5, 0x71, 0xc0, 0xdf, 0x9b, 0x4b, 0xec, 0x5a, 0x55, 0x0e, 0xf8, 0x2b, 0xc4,
- 0x69, 0xfa, 0xb2, 0x2e, 0x2e, 0xb1, 0x1f, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, 0xd3, 0x81, 0x81,
- 0x89, 0xc9, 0x07, 0x00, 0x00,
+ // 1062 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0xdf, 0x6f, 0xe3, 0x44,
+ 0x10, 0xce, 0x0f, 0x27, 0x6e, 0x26, 0x69, 0xcf, 0x2c, 0xe1, 0xce, 0x17, 0x21, 0x5a, 0x22, 0x24,
+ 0x2a, 0xb8, 0x26, 0xa8, 0x1c, 0x70, 0xbf, 0x38, 0xa9, 0x97, 0xb8, 0xd7, 0xa0, 0x34, 0x57, 0x6d,
+ 0x5a, 0xe9, 0x10, 0x0f, 0xd1, 0xc6, 0xde, 0xa4, 0xa6, 0xb6, 0xd7, 0x78, 0xd7, 0xa5, 0x79, 0xe7,
+ 0x5f, 0xe2, 0x7f, 0xe3, 0x81, 0x07, 0xb4, 0xbb, 0x76, 0xea, 0x42, 0x7a, 0xbc, 0x58, 0x3b, 0x33,
+ 0xdf, 0xec, 0xce, 0xcc, 0xf7, 0xad, 0x17, 0x5e, 0x2e, 0x7d, 0x71, 0x99, 0xce, 0x7b, 0x2e, 0x0b,
+ 0xfb, 0x41, 0xea, 0xfa, 0xea, 0x73, 0xb0, 0x64, 0x7d, 0x97, 0x85, 0x21, 0x8b, 0xfa, 0x71, 0xc2,
+ 0x04, 0xeb, 0x87, 0x7e, 0xc0, 0xfa, 0x24, 0x8a, 0x98, 0x20, 0xc2, 0x67, 0x11, 0xef, 0x29, 0x37,
+ 0x32, 0xa4, 0xbf, 0xb3, 0xbb, 0x64, 0x6c, 0x19, 0x50, 0x0d, 0x9d, 0xa7, 0x8b, 0xbe, 0xf0, 0x43,
+ 0xca, 0x05, 0x09, 0x63, 0x0d, 0xeb, 0xfe, 0x55, 0x86, 0x9d, 0x63, 0xe2, 0x07, 0x69, 0x42, 0x87,
+ 0x54, 0x10, 0x3f, 0xe0, 0xe8, 0x00, 0x0c, 0xb1, 0x8a, 0xa9, 0x5d, 0xde, 0x2b, 0xef, 0xef, 0x1c,
+ 0x3e, 0xee, 0xc9, 0x8d, 0x7a, 0x77, 0x31, 0xbd, 0xf3, 0x55, 0x4c, 0xb1, 0x82, 0x21, 0x04, 0x86,
+ 0xa0, 0x37, 0xc2, 0xae, 0xec, 0x95, 0xf7, 0x1b, 0x58, 0xad, 0xd1, 0x6b, 0x68, 0x2f, 0x88, 0x1f,
+ 0x50, 0x6f, 0xe6, 0x85, 0x33, 0x8f, 0xc6, 0x34, 0xf2, 0x68, 0xe4, 0xae, 0xec, 0xea, 0x5e, 0x75,
+ 0xbf, 0x79, 0xd8, 0xd2, 0x5b, 0x0e, 0x4f, 0xc7, 0x7e, 0x74, 0x85, 0x91, 0x46, 0x0e, 0xc3, 0xe1,
+ 0x1a, 0xd7, 0x75, 0xc1, 0x90, 0x27, 0xa0, 0x26, 0x98, 0x6f, 0x9d, 0x89, 0x83, 0x8f, 0xc6, 0x56,
+ 0x09, 0x6d, 0x43, 0xc3, 0x79, 0x3f, 0x70, 0xce, 0xce, 0x47, 0xef, 0x26, 0x56, 0x19, 0x35, 0xa0,
+ 0x36, 0x9a, 0x1c, 0xe3, 0x23, 0xab, 0x82, 0x6c, 0x68, 0x0f, 0x4f, 0x67, 0x43, 0xe7, 0xcc, 0x99,
+ 0x0c, 0x9d, 0xc9, 0xe0, 0xe7, 0xd9, 0xf1, 0xd1, 0x68, 0xec, 0x0c, 0xad, 0xaa, 0xcc, 0x19, 0x1c,
+ 0x4d, 0x06, 0xce, 0x58, 0x9a, 0x86, 0xdc, 0xcf, 0x79, 0x7f, 0x36, 0xc2, 0xce, 0xd0, 0xaa, 0x75,
+ 0xff, 0x00, 0x30, 0xa6, 0x82, 0xc6, 0xb2, 0x83, 0x88, 0x84, 0xba, 0xe1, 0x06, 0x56, 0x6b, 0xf4,
+ 0x04, 0x4c, 0x39, 0x65, 0x12, 0x79, 0xaa, 0xb1, 0xe6, 0x21, 0xd2, 0x45, 0xcb, 0x84, 0xde, 0x40,
+ 0x47, 0x70, 0x0e, 0x41, 0x5f, 0x40, 0x9d, 0x0b, 0x22, 0x52, 0x6e, 0x57, 0xd5, 0xd0, 0x5a, 0x39,
+ 0x58, 0xfa, 0x70, 0x16, 0x43, 0x3f, 0xc2, 0x83, 0x85, 0x1e, 0xe3, 0xcc, 0xd3, 0x73, 0xb4, 0x0d,
+ 0xb5, 0x77, 0x7b, 0xd3, 0x8c, 0xf1, 0xce, 0xe2, 0x2e, 0x2f, 0x4f, 0xc0, 0xe4, 0xe9, 0x9c, 0x0b,
+ 0x1a, 0xdb, 0x35, 0x35, 0xc7, 0x62, 0x49, 0x53, 0x1d, 0xc1, 0x39, 0x04, 0xfd, 0x00, 0xdb, 0x5c,
+ 0x78, 0x2c, 0x15, 0x33, 0x2e, 0x12, 0x4a, 0x42, 0xbb, 0x5e, 0x6c, 0x63, 0xcc, 0x96, 0x1e, 0x5b,
+ 0x4e, 0x55, 0x04, 0xb7, 0x34, 0x50, 0x5b, 0x59, 0x22, 0x4d, 0x92, 0x3c, 0xd1, 0xfc, 0x60, 0x22,
+ 0x4d, 0x92, 0x2c, 0xf1, 0x29, 0x98, 0x5c, 0x90, 0x44, 0x50, 0xcf, 0xde, 0x52, 0x29, 0x9d, 0x9e,
+ 0x56, 0x5f, 0x2f, 0x57, 0x5f, 0xef, 0x3c, 0x57, 0x1f, 0xce, 0xa1, 0xe8, 0x1b, 0xa8, 0x49, 0xd6,
+ 0x3d, 0xbb, 0xf1, 0xbf, 0x39, 0x1a, 0xb8, 0x16, 0x5c, 0x7b, 0xaf, 0xba, 0x16, 0x5c, 0x1f, 0xb6,
+ 0xe2, 0x84, 0x2d, 0x13, 0xca, 0xb9, 0xfd, 0x89, 0xda, 0xe8, 0xe3, 0xc2, 0x70, 0xce, 0xb2, 0x10,
+ 0x5e, 0x83, 0xd0, 0x67, 0x60, 0x04, 0x7e, 0x74, 0x65, 0x3f, 0x54, 0x60, 0xc8, 0x9a, 0x93, 0x7a,
+ 0x54, 0x7e, 0xf4, 0x35, 0x34, 0x99, 0xb8, 0xa4, 0xc9, 0x4c, 0x5a, 0xdc, 0x7e, 0xa4, 0x06, 0x5e,
+ 0x84, 0x81, 0x0a, 0xcb, 0x25, 0xcf, 0x4e, 0x8f, 0x69, 0x22, 0x56, 0xb6, 0xad, 0x90, 0xff, 0x3a,
+ 0x5d, 0x85, 0xf0, 0x1a, 0x84, 0x7e, 0x02, 0x8b, 0xb3, 0x34, 0x71, 0xe9, 0x2c, 0x24, 0x91, 0xbf,
+ 0xa0, 0x5c, 0x70, 0xfb, 0xb1, 0x4a, 0xdc, 0x2d, 0x72, 0xaa, 0x20, 0xa7, 0x39, 0xc2, 0x89, 0x44,
+ 0xb2, 0xc2, 0x0f, 0xf8, 0x5d, 0x6f, 0xe7, 0xcf, 0x32, 0x98, 0x99, 0x20, 0xd1, 0xe7, 0xd0, 0xca,
+ 0x24, 0x29, 0xeb, 0x96, 0x8a, 0x96, 0x23, 0x6a, 0x66, 0xbe, 0xb1, 0x1f, 0x51, 0x64, 0x41, 0xd5,
+ 0xfd, 0xdd, 0xcb, 0x6e, 0xab, 0x5c, 0xa2, 0xe7, 0x60, 0xd2, 0xe8, 0xda, 0x4f, 0x58, 0x94, 0xdd,
+ 0xcf, 0xdd, 0xff, 0x4a, 0xbd, 0xe7, 0x68, 0x84, 0xae, 0x21, 0xc7, 0x77, 0x5e, 0x40, 0xab, 0x18,
+ 0x90, 0x9b, 0x5f, 0xd1, 0x55, 0x76, 0x91, 0xe4, 0x12, 0xb5, 0xa1, 0x76, 0x4d, 0x82, 0x94, 0x66,
+ 0x07, 0x6a, 0xe3, 0x45, 0xe5, 0x59, 0xb9, 0xb3, 0x02, 0x33, 0x13, 0x2d, 0xda, 0x03, 0x43, 0xc9,
+ 0xba, 0x5c, 0x24, 0x43, 0x1e, 0x7f, 0x52, 0xc2, 0x2a, 0x82, 0x8e, 0xe0, 0xa3, 0xdb, 0x5f, 0x5c,
+ 0x2e, 0xcc, 0xca, 0x7d, 0xc2, 0x3c, 0x29, 0x61, 0xeb, 0x16, 0xae, 0x7d, 0x6f, 0x1a, 0xeb, 0xeb,
+ 0xd3, 0x79, 0x0d, 0x5b, 0xb9, 0x24, 0x64, 0x81, 0x82, 0x09, 0x12, 0xa8, 0xc3, 0x6b, 0x58, 0x1b,
+ 0xe8, 0x53, 0x68, 0xb8, 0x2c, 0x8c, 0x03, 0x2a, 0xd5, 0x5c, 0x51, 0x91, 0x5b, 0x47, 0xe7, 0xa9,
+ 0xca, 0xd7, 0x54, 0x6e, 0xfa, 0x79, 0x6c, 0x6c, 0xba, 0xf3, 0x0c, 0x5a, 0x39, 0x6b, 0x52, 0x36,
+ 0x72, 0x58, 0x69, 0x12, 0xe4, 0xc3, 0x4a, 0x93, 0x00, 0x3d, 0x84, 0x3a, 0xbf, 0x24, 0x87, 0xdf,
+ 0x7d, 0x9f, 0x25, 0x66, 0x56, 0xe7, 0x17, 0x68, 0x6f, 0xd2, 0xc2, 0x86, 0x71, 0x1f, 0x14, 0x4f,
+ 0x6e, 0x1e, 0x3e, 0x2a, 0x30, 0x59, 0x3c, 0xbb, 0xc0, 0x43, 0xf7, 0xef, 0x32, 0x18, 0xaa, 0x9e,
+ 0x36, 0xd4, 0x02, 0x32, 0xa7, 0x79, 0x45, 0xda, 0x40, 0xbb, 0xd0, 0x24, 0x81, 0x4f, 0xf8, 0x4c,
+ 0xc7, 0x74, 0x61, 0xa0, 0x5c, 0x63, 0x05, 0x40, 0xba, 0x0d, 0xf9, 0xe3, 0x6b, 0x9c, 0x94, 0x74,
+ 0x23, 0xcf, 0x61, 0x3b, 0x50, 0x7c, 0xe4, 0x54, 0x19, 0x1f, 0xa0, 0xaa, 0x15, 0x14, 0x6c, 0xf4,
+ 0x0a, 0x76, 0x7c, 0xce, 0x02, 0x22, 0xe8, 0x8c, 0xcd, 0x7f, 0xa5, 0xae, 0xb0, 0x6b, 0xc5, 0xfb,
+ 0x3c, 0xd2, 0xb1, 0x77, 0x2a, 0x74, 0x52, 0xc2, 0xdb, 0x7e, 0xd1, 0x81, 0xbe, 0x04, 0xd3, 0x0b,
+ 0xd5, 0x9d, 0xcd, 0xfe, 0x77, 0x77, 0xde, 0x9a, 0x93, 0x12, 0xae, 0x7b, 0xa1, 0x5c, 0xbd, 0x31,
+ 0xb3, 0x41, 0x75, 0x31, 0xb4, 0x8a, 0xf5, 0x28, 0x0e, 0x68, 0x72, 0x4d, 0x93, 0x6c, 0x0c, 0x99,
+ 0x25, 0xfd, 0x71, 0x42, 0x17, 0xfe, 0x4d, 0xce, 0x8d, 0xb6, 0xd6, 0xfc, 0x57, 0x6f, 0xf9, 0xef,
+ 0xbe, 0x84, 0xed, 0x3b, 0x75, 0xde, 0xbb, 0x29, 0x02, 0xe3, 0x92, 0xf0, 0xcb, 0xfc, 0xed, 0x94,
+ 0xeb, 0x6e, 0x04, 0x75, 0x5d, 0xed, 0xbd, 0x59, 0x6d, 0xa8, 0xfd, 0x96, 0x52, 0x9e, 0x3f, 0xb9,
+ 0xda, 0x40, 0x36, 0x98, 0x44, 0x08, 0x1a, 0xc6, 0x42, 0xd5, 0x52, 0xc5, 0xb9, 0x29, 0xc5, 0x4c,
+ 0x6f, 0xa8, 0x9b, 0xca, 0xcb, 0xa0, 0x98, 0xa8, 0xe2, 0x5b, 0xc7, 0x57, 0xaf, 0xa0, 0xae, 0xdf,
+ 0x29, 0xf9, 0x3a, 0xe2, 0x8b, 0xc9, 0x64, 0x34, 0x79, 0x6b, 0x95, 0xa4, 0x31, 0xbd, 0x18, 0x0c,
+ 0x9c, 0xe9, 0xd4, 0x2a, 0x4b, 0x43, 0x3e, 0xa9, 0x17, 0xd8, 0xb1, 0x2a, 0xd2, 0x90, 0x0f, 0xad,
+ 0x84, 0x55, 0xe7, 0x75, 0xf5, 0x9f, 0xfe, 0xf6, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd5, 0xd8,
+ 0x99, 0x95, 0xac, 0x08, 0x00, 0x00,
}
diff --git a/common/proto/milo/annotations.proto b/common/proto/milo/annotations.proto
index a77a82f..b9bfe53 100644
--- a/common/proto/milo/annotations.proto
+++ b/common/proto/milo/annotations.proto
@@ -137,6 +137,27 @@
string value = 2;
}
repeated Property property = 24;
+
+ // Links to a recipe_engine.Manifest proto.
+ message ManifestLink {
+ // The fully qualified (logdog://) url of the Manifest proto. It's expected
+ // that this is a binary logdog stream consisting of exactly one Manifest
+ // proto.
+ string url = 1;
+
+ // The hash of the Manifest's raw binary form (i.e. the bytes at the end of
+ // `url`, without any interpretation or decoding). Milo will use this as an
+ // optimization; Manifests will be interned once into Milo's datastore.
+ // Future hashes which match will not be loaded from the url, but will be
+ // assumed to be identical. If the sha256 doesn't match the data at the URL,
+ // Milo may render this build with the wrong manifest.
+ string sha256 = 2;
+ }
+
+ // Maps the name of the Manifest, e.g. UNPATCHED, INFRA, etc. to the
+ // ManifestLink. This name will be used in the milo console definition to
+ // indicate which manifest data to sort the console view by.
+ map<string, ManifestLink> source_manifests = 25;
}
// A Link is an optional label followed by a typed link to an external
diff --git a/milo/api/resp/build.go b/milo/api/resp/build.go
index 582f4df..1cf550d 100644
--- a/milo/api/resp/build.go
+++ b/milo/api/resp/build.go
@@ -18,9 +18,14 @@
package resp
import (
+ "encoding/hex"
"encoding/json"
"time"
+ "golang.org/x/net/context"
+
+ "github.com/luci/luci-go/common/logging"
+ "github.com/luci/luci-go/milo/common"
"github.com/luci/luci-go/milo/common/model"
)
@@ -278,7 +283,7 @@
}
// SummarizeTo summarizes the data into a given model.BuildSummary.
-func (rb *MiloBuild) SummarizeTo(bs *model.BuildSummary) {
+func (rb *MiloBuild) SummarizeTo(c context.Context, bs *model.BuildSummary) error {
bs.Summary = rb.Summary.toModelSummary()
if rb.Summary.Status == model.Running {
// Assume the last step is the current step.
@@ -288,13 +293,29 @@
}
}
if rb.SourceStamp != nil {
- // TODO(hinoka): This should be full manifests, but lets just use single
- // revisions for now.
+ // TODO(hinoka, iannucci): This should be full manifests, but lets just use
+ // single revisions for now. HACKS!
if rb.SourceStamp.Revision != nil {
- bs.Manifests = append(bs.Manifests, model.ManifestLink{
- Name: "REVISION",
- ID: []byte(rb.SourceStamp.Revision.Label),
- })
+ revisionBytes, err := hex.DecodeString(rb.SourceStamp.Revision.Label)
+ if err != nil {
+ logging.WithError(err).Warningf(c, "bad revision (not hex-decodable)")
+ } else {
+ bs.Manifests = append(bs.Manifests, model.ManifestLink{
+ Name: "REVISION",
+ ID: []byte(rb.SourceStamp.Revision.Label),
+ })
+ consoles, err := common.GetConsolesForBuilder(c, bs.BuilderID)
+ if err != nil {
+ return err
+ }
+ for _, con := range consoles {
+ // HACK(iannucci): Until we have real manifest support, console
+ // definitions will specify their manifest as "REVISION", and we'll do
+ // lookups with null URL fields.
+ bs.AddManifestRevisionIndex(
+ con.ProjectID, con.Console.Name, "REVISION", "", revisionBytes)
+ }
+ }
}
if rb.SourceStamp.Changelist != nil {
bs.Patches = append(bs.Patches, model.PatchInfo{
@@ -303,4 +324,5 @@
})
}
}
+ return nil
}
diff --git a/milo/buildsource/buildbot/pubsub.go b/milo/buildsource/buildbot/pubsub.go
index 714e43b..b82e3f8 100644
--- a/milo/buildsource/buildbot/pubsub.go
+++ b/milo/buildsource/buildbot/pubsub.go
@@ -233,7 +233,9 @@
BuildKey: datastore.KeyForObj(c, b),
BuilderID: fmt.Sprintf("buildbot/%s/%s", b.Master, b.Buildername),
}
- resp.SummarizeTo(&bs)
+ if err := resp.SummarizeTo(c, &bs); err != nil {
+ return err
+ }
return datastore.Put(c, &bs)
}
diff --git a/milo/buildsource/buildbucket/pubsub.go b/milo/buildsource/buildbucket/pubsub.go
index 077be7d..6b8c41a 100644
--- a/milo/buildsource/buildbucket/pubsub.go
+++ b/milo/buildsource/buildbucket/pubsub.go
@@ -164,7 +164,9 @@
}
if entry.respBuild != nil {
// Add info from the respBuild into the build summary if we have the data.
- entry.respBuild.SummarizeTo(&bs)
+ if err := entry.respBuild.SummarizeTo(c, &bs); err != nil {
+ return err
+ }
}
logging.Debugf(c, "Created build summary: %#v", bs)
// Make datastore flakes transient errors
diff --git a/milo/common/config.go b/milo/common/config.go
index 757e10e..42097a9 100644
--- a/milo/common/config.go
+++ b/milo/common/config.go
@@ -298,3 +298,29 @@
}
return nil, fmt.Errorf("Console %s not found in project %s", consoleName, projName)
}
+
+// ProjectConsole is a simple tuple type for GetConsolesForBuilder.
+type ProjectConsole struct {
+ ProjectID string
+ Console *config.Console
+}
+
+// GetConsolesForBuilder retrieves all the console definitions that this builder
+// belongs to.
+func GetConsolesForBuilder(c context.Context, builderName string) ([]*ProjectConsole, error) {
+ projs, err := GetAllProjects(c)
+ if err != nil {
+ return nil, err
+ }
+ ret := []*ProjectConsole{}
+ for _, p := range projs {
+ for _, con := range p.Consoles {
+ for _, b := range con.Builders {
+ if b.Name == builderName {
+ ret = append(ret, &ProjectConsole{p.ID, con})
+ }
+ }
+ }
+ }
+ return ret, nil
+}
diff --git a/milo/common/model/build_summary.go b/milo/common/model/build_summary.go
index 1eb62af..ac7f09d 100644
--- a/milo/common/model/build_summary.go
+++ b/milo/common/model/build_summary.go
@@ -15,9 +15,12 @@
package model
import (
+ "bytes"
"time"
"github.com/luci/gae/service/datastore"
+
+ "github.com/luci/luci-go/common/data/cmpbin"
)
// BuildSummary is a datastore model which is used for storing staandardized
@@ -42,40 +45,6 @@
// "buildbucket/<bucketname>/<buildername>"
BuilderID string
- // KnownConsoleHash is used for backfilling and must always equal the raw
- // value of:
- //
- // sha256(sorted(ConsoleEpochs.keys())
- //
- // This is used to identify BuildSummaries which haven't yet been included in
- // some new Console definition (or which have been removed from a Console
- // definition).
- KnownConsoleHash []byte
-
- // ConsoleEpochs is used for backfilling, and is a series of cmpbin tuples:
- //
- // (console_name[str], recorded_epoch[int])
- //
- // This maps which epoch (version) of a console definition this BuildSummary
- // belongs to. Whenever a console definition changes, its epoch increases. The
- // backfiller will then identify BuildSummary objects which are out of date
- // and update them.
- ConsoleEpochs [][]byte
-
- // ConsoleTags contains query tags for the console view. These are cmpbin
- // tuples which look like:
- //
- // (console_name[str], sort_criteria[tuple], sort_values[tuple])
- //
- // `sort_criteria` are defined by the console definition, and will likely look
- // like (manifest_name[str], repo_url[str]), but other sort_criteria may be
- // added later.
- //
- // `sort_values` are defined by the selected sort_criteria, and will likely
- // look like (commit_revision[str],). In any event, this string is opaque and
- // only to be used by the console itself.
- ConsoleTags [][]byte
-
// Created is the time when the Build was first created. Due to pending
// queues, this may be substantially before Summary.Start.
Created time.Time
@@ -94,4 +63,31 @@
// We reserve the multi-patch case for advanced (multi-repo) tryjobs...
// Typically there will only be one patch associated with a build.
Patches []PatchInfo
+
+ // ManifestRevisionIndex has a single entry for each
+ // 0 ++ project ++ console ++ manifest_name ++ url ++ revision.decode('hex')
+ // which matched for this build. ++ is cmpbin concatenation.
+ //
+ // Example:
+ // 0 ++ "chromium" ++ "main" ++ "UNPATCHED" ++ "https://.../src.git" ++ deadbeef
+ //
+ // The list of interested consoles is compiled at build summarization time.
+ ManifestRevisionIndex [][]byte
+}
+
+// AddManifestRevisionIndex adds a new entry to ManifestRevisionIndex.
+//
+// `revision` should be the hex-decoded git revision.
+//
+// It's up to the caller to ensure that entries in ManifestRevisionIndex aren't
+// duplicated.
+func (bs *BuildSummary) AddManifestRevisionIndex(project, console, manifest, repoURL string, revision []byte) {
+ var buf bytes.Buffer
+ cmpbin.WriteUint(&buf, 0) // version
+ cmpbin.WriteString(&buf, project)
+ cmpbin.WriteString(&buf, console)
+ cmpbin.WriteString(&buf, manifest)
+ cmpbin.WriteString(&buf, repoURL)
+ cmpbin.WriteBytes(&buf, revision)
+ bs.ManifestRevisionIndex = append(bs.ManifestRevisionIndex, buf.Bytes())
}
