Add isolate path to WaitTaskResult
Add subtopic identifier to Notification
BUG=1008615
R=pprabhu@google.com
Change-Id: I1a2589aa2bd2b33fd4c61b1940dc2876865fc400
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/proto/+/1913628
Commit-Queue: Jacob Kopczynski <jkop@chromium.org>
Tested-by: Jacob Kopczynski <jkop@chromium.org>
Auto-Submit: Jacob Kopczynski <jkop@chromium.org>
Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org>
diff --git a/descpb.bin b/descpb.bin
index 0211896..38b2d64 100644
--- a/descpb.bin
+++ b/descpb.bin
Binary files differ
diff --git a/go/test_platform/skylab_tool/result.pb.go b/go/test_platform/skylab_tool/result.pb.go
index 6028ad8..ab059c8 100644
--- a/go/test_platform/skylab_tool/result.pb.go
+++ b/go/test_platform/skylab_tool/result.pb.go
@@ -22,12 +22,13 @@
// WaitTaskResult describes the format returned by the `skylab wait-task` subcommand.
type WaitTaskResult struct {
- Result *WaitTaskResult_Task `protobuf:"bytes,1,opt,name=result,json=task-result,proto3" json:"result,omitempty"`
- Stdout string `protobuf:"bytes,2,opt,name=stdout,proto3" json:"stdout,omitempty"`
- ChildResults []*WaitTaskResult_Task `protobuf:"bytes,3,rep,name=child_results,json=child-results,proto3" json:"child_results,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
+ Result *WaitTaskResult_Task `protobuf:"bytes,1,opt,name=result,json=task-result,proto3" json:"result,omitempty"`
+ Stdout string `protobuf:"bytes,2,opt,name=stdout,proto3" json:"stdout,omitempty"`
+ ChildResults []*WaitTaskResult_Task `protobuf:"bytes,3,rep,name=child_results,json=child-results,proto3" json:"child_results,omitempty"`
+ LogDataUrl *WaitTaskResult_LogDataURL `protobuf:"bytes,4,opt,name=log_data_url,json=logDataUrl,proto3" json:"log_data_url,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
}
func (m *WaitTaskResult) Reset() { *m = WaitTaskResult{} }
@@ -76,6 +77,13 @@
return nil
}
+func (m *WaitTaskResult) GetLogDataUrl() *WaitTaskResult_LogDataURL {
+ if m != nil {
+ return m.LogDataUrl
+ }
+ return nil
+}
+
type WaitTaskResult_Task struct {
Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
State string `protobuf:"bytes,2,opt,name=state,proto3" json:"state,omitempty"`
@@ -181,6 +189,45 @@
return ""
}
+type WaitTaskResult_LogDataURL struct {
+ IsolateUrl string `protobuf:"bytes,1,opt,name=isolate_url,json=isolateUrl,proto3" json:"isolate_url,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
+}
+
+func (m *WaitTaskResult_LogDataURL) Reset() { *m = WaitTaskResult_LogDataURL{} }
+func (m *WaitTaskResult_LogDataURL) String() string { return proto.CompactTextString(m) }
+func (*WaitTaskResult_LogDataURL) ProtoMessage() {}
+func (*WaitTaskResult_LogDataURL) Descriptor() ([]byte, []int) {
+ return fileDescriptor_febb2b9b7927acc2, []int{0, 1}
+}
+
+func (m *WaitTaskResult_LogDataURL) XXX_Unmarshal(b []byte) error {
+ return xxx_messageInfo_WaitTaskResult_LogDataURL.Unmarshal(m, b)
+}
+func (m *WaitTaskResult_LogDataURL) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+ return xxx_messageInfo_WaitTaskResult_LogDataURL.Marshal(b, m, deterministic)
+}
+func (m *WaitTaskResult_LogDataURL) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_WaitTaskResult_LogDataURL.Merge(m, src)
+}
+func (m *WaitTaskResult_LogDataURL) XXX_Size() int {
+ return xxx_messageInfo_WaitTaskResult_LogDataURL.Size(m)
+}
+func (m *WaitTaskResult_LogDataURL) XXX_DiscardUnknown() {
+ xxx_messageInfo_WaitTaskResult_LogDataURL.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_WaitTaskResult_LogDataURL proto.InternalMessageInfo
+
+func (m *WaitTaskResult_LogDataURL) GetIsolateUrl() string {
+ if m != nil {
+ return m.IsolateUrl
+ }
+ return ""
+}
+
// WaitTasksResult describes the format returned by the `skylab wait-tasks` subcommand.
type WaitTasksResult struct {
Results []*WaitTaskResult `protobuf:"bytes,1,rep,name=results,proto3" json:"results,omitempty"`
@@ -234,6 +281,7 @@
func init() {
proto.RegisterType((*WaitTaskResult)(nil), "test_platform.skylab_tool.WaitTaskResult")
proto.RegisterType((*WaitTaskResult_Task)(nil), "test_platform.skylab_tool.WaitTaskResult.Task")
+ proto.RegisterType((*WaitTaskResult_LogDataURL)(nil), "test_platform.skylab_tool.WaitTaskResult.LogDataURL")
proto.RegisterType((*WaitTasksResult)(nil), "test_platform.skylab_tool.WaitTasksResult")
}
@@ -242,29 +290,32 @@
}
var fileDescriptor_febb2b9b7927acc2 = []byte{
- // 375 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0x4f, 0xcb, 0xd3, 0x40,
- 0x10, 0xc6, 0x89, 0xe9, 0x9b, 0xb6, 0xd3, 0xd6, 0xc2, 0x22, 0xb2, 0x7a, 0x90, 0x50, 0x44, 0xe2,
- 0xa1, 0x1b, 0xd0, 0x6f, 0x60, 0xf1, 0xe4, 0x2d, 0x14, 0x04, 0x2f, 0x61, 0x9b, 0x6c, 0xd3, 0xa5,
- 0x9b, 0x6c, 0xdd, 0x3f, 0x82, 0xdf, 0xd0, 0xcf, 0xe4, 0x49, 0x32, 0xd9, 0x94, 0xf6, 0x50, 0x90,
- 0xf7, 0xb6, 0x33, 0xfb, 0x7b, 0x9e, 0xcd, 0x3c, 0x19, 0xf8, 0xe0, 0x84, 0x75, 0xe5, 0x45, 0x71,
- 0x77, 0xd4, 0xa6, 0xcd, 0xed, 0xf9, 0xb7, 0xe2, 0x87, 0xd2, 0x69, 0xad, 0x72, 0x23, 0xac, 0x57,
- 0x8e, 0x5d, 0x8c, 0x76, 0x9a, 0xbc, 0xb9, 0xe3, 0xd8, 0x0d, 0xb7, 0xf9, 0x13, 0xc3, 0xcb, 0xef,
- 0x5c, 0xba, 0x3d, 0xb7, 0xe7, 0x02, 0x35, 0xe4, 0x1b, 0x24, 0x83, 0x9a, 0x46, 0x69, 0x94, 0x2d,
- 0x3e, 0x31, 0xf6, 0x50, 0xce, 0xee, 0xa5, 0x0c, 0x8f, 0x0b, 0xc7, 0xed, 0x79, 0x3b, 0x58, 0x90,
- 0xd7, 0x90, 0x58, 0x57, 0x6b, 0xef, 0xe8, 0x8b, 0x34, 0xca, 0xe6, 0x45, 0xa8, 0xc8, 0x1e, 0x56,
- 0xd5, 0x49, 0xaa, 0xba, 0x1c, 0x38, 0x4b, 0xe3, 0x34, 0x7e, 0xc6, 0x5b, 0x83, 0x49, 0x78, 0xcc,
- 0xbe, 0xfd, 0x1b, 0xc1, 0xa4, 0xef, 0x13, 0x02, 0x93, 0x8e, 0xb7, 0x02, 0x27, 0x98, 0x17, 0x78,
- 0x26, 0xaf, 0xe0, 0xc9, 0x3a, 0xee, 0x44, 0xf8, 0x92, 0xa1, 0x20, 0x14, 0xa6, 0x47, 0x2e, 0x95,
- 0x37, 0x82, 0xc6, 0x69, 0x94, 0xcd, 0x8a, 0xb1, 0xec, 0x6f, 0xac, 0xaf, 0x2a, 0x61, 0x2d, 0x9d,
- 0x0c, 0x37, 0xa1, 0x24, 0x29, 0xe0, 0x8c, 0xa5, 0xf1, 0x5d, 0x29, 0x6b, 0xfa, 0x84, 0x7e, 0x61,
- 0x6c, 0xdf, 0x6d, 0x65, 0x4d, 0x32, 0x58, 0x0f, 0x84, 0xf8, 0xe9, 0xfb, 0x81, 0x64, 0x4d, 0x13,
- 0xa4, 0xd6, 0x21, 0x1c, 0x6c, 0xf7, 0xe4, 0x06, 0x96, 0x57, 0x2f, 0x6f, 0x14, 0x9d, 0x22, 0xb6,
- 0xbc, 0x9a, 0x79, 0xa3, 0xc8, 0x7b, 0x58, 0x21, 0xa3, 0x74, 0x63, 0x11, 0x9a, 0x21, 0x84, 0xcd,
- 0x6d, 0xdf, 0xec, 0xa9, 0xcd, 0x2f, 0x58, 0x8f, 0x11, 0xd9, 0xf0, 0x2b, 0x77, 0x30, 0x1d, 0xf3,
- 0x8d, 0x30, 0xdf, 0x8f, 0xff, 0x9d, 0x6f, 0x31, 0x2a, 0xc9, 0x3b, 0x00, 0xd9, 0x55, 0xba, 0xbd,
- 0x28, 0x11, 0xc2, 0x9b, 0x15, 0x37, 0x9d, 0x2f, 0x5f, 0x7f, 0xec, 0x1a, 0xcd, 0xaa, 0x93, 0xd1,
- 0xad, 0xf4, 0x2d, 0xd3, 0xa6, 0xc9, 0xc7, 0x42, 0xdb, 0x5c, 0x76, 0x47, 0xc3, 0x73, 0xdc, 0xc3,
- 0xbc, 0xd1, 0xf9, 0xc3, 0x8d, 0x3d, 0x24, 0xc8, 0x7c, 0xfe, 0x17, 0x00, 0x00, 0xff, 0xff, 0x9f,
- 0x8a, 0x7c, 0xf6, 0xd5, 0x02, 0x00, 0x00,
+ // 431 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0x41, 0x6f, 0xd3, 0x30,
+ 0x14, 0xc7, 0x15, 0xda, 0xb5, 0xdd, 0x6b, 0x47, 0x25, 0x0b, 0xa1, 0xb0, 0x03, 0x44, 0x15, 0x42,
+ 0xe5, 0x10, 0x47, 0x02, 0x3e, 0x01, 0x83, 0x13, 0x3b, 0x59, 0x1b, 0x48, 0x5c, 0x22, 0x2f, 0x71,
+ 0x33, 0xab, 0x4e, 0x5c, 0xfc, 0x6c, 0x24, 0x3e, 0x25, 0xdf, 0x87, 0x13, 0xca, 0x8b, 0x33, 0xb6,
+ 0xc3, 0xa4, 0x8a, 0x9b, 0xdf, 0xeb, 0xef, 0xff, 0x77, 0xdf, 0xff, 0xc5, 0xf0, 0xc6, 0x2b, 0xf4,
+ 0xe5, 0xc1, 0x48, 0xbf, 0xb3, 0xae, 0x2d, 0x70, 0xff, 0xcb, 0xc8, 0x9b, 0xd2, 0x5b, 0x6b, 0x0a,
+ 0xa7, 0x30, 0x18, 0xcf, 0x0f, 0xce, 0x7a, 0xcb, 0x5e, 0x3c, 0xe0, 0xf8, 0x3d, 0x6e, 0xf3, 0x7b,
+ 0x0a, 0x4f, 0xbf, 0x49, 0xed, 0xaf, 0x24, 0xee, 0x05, 0x69, 0xd8, 0x17, 0x98, 0x0d, 0xea, 0x34,
+ 0xc9, 0x92, 0xed, 0xf2, 0x1d, 0xe7, 0x8f, 0xca, 0xf9, 0x43, 0x29, 0xa7, 0xe3, 0xd2, 0x4b, 0xdc,
+ 0xe7, 0x83, 0x05, 0x7b, 0x0e, 0x33, 0xf4, 0xb5, 0x0d, 0x3e, 0x7d, 0x92, 0x25, 0xdb, 0x53, 0x11,
+ 0x2b, 0x76, 0x05, 0x67, 0xd5, 0xad, 0x36, 0x75, 0x39, 0x70, 0x98, 0x4e, 0xb2, 0xc9, 0x7f, 0xdc,
+ 0x35, 0x98, 0xc4, 0xcb, 0x90, 0x7d, 0x85, 0x95, 0xb1, 0x4d, 0x59, 0x4b, 0x2f, 0xcb, 0xe0, 0x4c,
+ 0x3a, 0xa5, 0x01, 0x3e, 0x1c, 0x6f, 0x7a, 0x69, 0x9b, 0x4f, 0xd2, 0xcb, 0x6b, 0x71, 0x29, 0xc0,
+ 0xc4, 0xb3, 0x33, 0xe7, 0x7f, 0x12, 0x98, 0xf6, 0x14, 0x63, 0x30, 0xed, 0x64, 0xab, 0x28, 0x99,
+ 0x53, 0x41, 0x67, 0xf6, 0x0c, 0x4e, 0xd0, 0x4b, 0xaf, 0xe2, 0x84, 0x43, 0xc1, 0x52, 0x98, 0xef,
+ 0xa4, 0x36, 0xc1, 0xa9, 0x74, 0x92, 0x25, 0xdb, 0x85, 0x18, 0xcb, 0xfe, 0x17, 0x0c, 0x55, 0xa5,
+ 0x10, 0xe9, 0xff, 0x2d, 0xc4, 0x58, 0xb2, 0x0c, 0x28, 0xbb, 0xd2, 0x85, 0xae, 0xd4, 0x75, 0x7a,
+ 0x42, 0x7e, 0x31, 0xce, 0xd0, 0xe5, 0xba, 0x66, 0x5b, 0x58, 0x0f, 0x84, 0xfa, 0x11, 0xfa, 0x99,
+ 0x74, 0x9d, 0xce, 0x88, 0x5a, 0xc7, 0xd0, 0xa9, 0xdd, 0x93, 0x1b, 0x58, 0xdd, 0x79, 0xf5, 0x51,
+ 0xcc, 0x09, 0x5b, 0xdd, 0x99, 0x05, 0x67, 0xd8, 0x6b, 0x38, 0x23, 0xc6, 0xd8, 0x06, 0x09, 0x5a,
+ 0x10, 0x44, 0xcd, 0xbc, 0x6f, 0xf6, 0xd4, 0x79, 0x0e, 0xf0, 0x2f, 0x16, 0xf6, 0x0a, 0x96, 0x1a,
+ 0xad, 0x91, 0x5e, 0x91, 0x62, 0x08, 0x02, 0x62, 0xeb, 0xda, 0x99, 0xcd, 0x4f, 0x58, 0x8f, 0xa1,
+ 0x62, 0xfc, 0xa2, 0x2e, 0x60, 0x3e, 0xae, 0x39, 0xa1, 0x35, 0xbf, 0x3d, 0x7a, 0x23, 0x62, 0x54,
+ 0xb2, 0x97, 0x00, 0xba, 0xab, 0x6c, 0x7b, 0x30, 0x2a, 0x66, 0xbd, 0x10, 0xf7, 0x3a, 0x1f, 0x3f,
+ 0x7f, 0xbf, 0x68, 0x2c, 0xaf, 0x6e, 0x9d, 0x6d, 0x75, 0x68, 0xb9, 0x75, 0x4d, 0x31, 0x16, 0x16,
+ 0x0b, 0xdd, 0xed, 0x9c, 0x2c, 0xe8, 0x39, 0x14, 0x8d, 0x2d, 0x1e, 0x7d, 0x38, 0x37, 0x33, 0x62,
+ 0xde, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x62, 0x51, 0xd2, 0x4e, 0x5c, 0x03, 0x00, 0x00,
}
diff --git a/src/test_platform/skylab_tool/result.proto b/src/test_platform/skylab_tool/result.proto
index 073199a..32c6efb 100644
--- a/src/test_platform/skylab_tool/result.proto
+++ b/src/test_platform/skylab_tool/result.proto
@@ -36,6 +36,12 @@
Task result = 1 [json_name="task-result"];
string stdout = 2;
repeated Task child_results = 3 [json_name="child-results"];
+
+ message LogDataURL {
+ string isolate_url = 1;
+ }
+
+ LogDataURL log_data_url = 4;
}
// WaitTasksResult describes the format returned by the `skylab wait-tasks` subcommand.
@@ -45,4 +51,4 @@
// True if an error or timeout was encountered while waiting for tasks
// to complete.
bool incomplete = 2;
-}
\ No newline at end of file
+}
