Add GS URL to wait task result proto
Bug: 1022989
Change-Id: I6c4103f82bd5487ec123bc83e5308fc49bc96f9f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/proto/+/2013698
Tested-by: Jacob Kopczynski <jkop@chromium.org>
Reviewed-by: Jacob Kopczynski <jkop@chromium.org>
Reviewed-by: Alex Zamorzaev <zamorzaev@chromium.org>
Commit-Queue: Alex Zamorzaev <zamorzaev@chromium.org>
Auto-Submit: Jacob Kopczynski <jkop@chromium.org>
diff --git a/descpb.bin b/descpb.bin
index c39e22a..973a7ff 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 ab059c8..84e7bb4 100644
--- a/go/test_platform/skylab_tool/result.pb.go
+++ b/go/test_platform/skylab_tool/result.pb.go
@@ -25,7 +25,7 @@
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"`
+ LogDataUrl *WaitTaskResult_LogDataURL `protobuf:"bytes,4,opt,name=log_data_url,json=log-data-url,proto3" json:"log_data_url,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -190,7 +190,9 @@
}
type WaitTaskResult_LogDataURL struct {
- IsolateUrl string `protobuf:"bytes,1,opt,name=isolate_url,json=isolateUrl,proto3" json:"isolate_url,omitempty"`
+ IsolateUrl string `protobuf:"bytes,1,opt,name=isolate_url,json=isolateUrl,proto3" json:"isolate_url,omitempty"` // Deprecated: Do not use.
+ // Google Storage URL, in full "gs://bucket/foo/bar/baz" form
+ GsUrl string `protobuf:"bytes,2,opt,name=gs_url,json=gs-url,proto3" json:"gs_url,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -221,6 +223,7 @@
var xxx_messageInfo_WaitTaskResult_LogDataURL proto.InternalMessageInfo
+// Deprecated: Do not use.
func (m *WaitTaskResult_LogDataURL) GetIsolateUrl() string {
if m != nil {
return m.IsolateUrl
@@ -228,11 +231,17 @@
return ""
}
+func (m *WaitTaskResult_LogDataURL) GetGsUrl() string {
+ if m != nil {
+ return m.GsUrl
+ }
+ 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"`
- // True if an error or timeout was encountered while waiting for tasks
- // to complete.
+ // True if an error or timeout was encountered while waiting for tasks to complete.
Incomplete bool `protobuf:"varint,2,opt,name=incomplete,proto3" json:"incomplete,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
@@ -290,32 +299,33 @@
}
var fileDescriptor_febb2b9b7927acc2 = []byte{
- // 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,
+ // 446 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0xcf, 0x6e, 0xd4, 0x30,
+ 0x10, 0xc6, 0x95, 0xee, 0x76, 0x77, 0x3b, 0xbb, 0x65, 0x25, 0x0b, 0x21, 0xc3, 0x01, 0x45, 0x0b,
+ 0x42, 0xcb, 0x21, 0x8e, 0x04, 0x3c, 0x41, 0x0b, 0x07, 0x44, 0x4f, 0x56, 0x2b, 0x10, 0x97, 0xc8,
+ 0x4d, 0xbc, 0xa9, 0xb5, 0x4e, 0xbc, 0xf8, 0x0f, 0x12, 0x0f, 0xcd, 0x0b, 0x70, 0x42, 0x9e, 0x38,
+ 0xa5, 0x3d, 0x54, 0xaa, 0xb8, 0x79, 0x26, 0xbf, 0xf9, 0x9c, 0xf9, 0x66, 0x0c, 0x6f, 0xbc, 0x74,
+ 0xbe, 0x3a, 0x68, 0xe1, 0x77, 0xc6, 0x76, 0xa5, 0xdb, 0xff, 0xd2, 0xe2, 0xba, 0xf2, 0xc6, 0xe8,
+ 0xd2, 0x4a, 0x17, 0xb4, 0x67, 0x07, 0x6b, 0xbc, 0x21, 0xcf, 0xef, 0x71, 0xec, 0x0e, 0xb7, 0xf9,
+ 0x3d, 0x85, 0x27, 0x5f, 0x85, 0xf2, 0x97, 0xc2, 0xed, 0x39, 0xd6, 0x90, 0x2f, 0x30, 0x1b, 0xaa,
+ 0x69, 0x96, 0x67, 0xdb, 0xe5, 0x3b, 0xc6, 0x1e, 0x2c, 0x67, 0xf7, 0x4b, 0x19, 0x1e, 0x97, 0x5e,
+ 0xb8, 0x7d, 0x31, 0x48, 0x90, 0x67, 0x30, 0x73, 0xbe, 0x31, 0xc1, 0xd3, 0xa3, 0x3c, 0xdb, 0x9e,
+ 0xf0, 0x14, 0x91, 0x4b, 0x38, 0xad, 0x6f, 0x94, 0x6e, 0xaa, 0x81, 0x73, 0x74, 0x92, 0x4f, 0xfe,
+ 0xe3, 0xae, 0x41, 0x24, 0x5d, 0xe6, 0xc8, 0x37, 0x58, 0x69, 0xd3, 0x56, 0x8d, 0xf0, 0xa2, 0x0a,
+ 0x56, 0xd3, 0x29, 0x36, 0xf0, 0xe1, 0xf1, 0xa2, 0x17, 0xa6, 0xfd, 0x28, 0xbc, 0xb8, 0xe2, 0x17,
+ 0x3c, 0x2a, 0x15, 0x51, 0xa9, 0x08, 0x56, 0xbf, 0xf8, 0x93, 0xc1, 0x34, 0x72, 0x84, 0xc0, 0xb4,
+ 0x17, 0x9d, 0x44, 0x6f, 0x4e, 0x38, 0x9e, 0xc9, 0x53, 0x38, 0x76, 0x5e, 0x78, 0x99, 0x7a, 0x1c,
+ 0x02, 0x42, 0x61, 0xbe, 0x13, 0x4a, 0x07, 0x2b, 0xe9, 0x24, 0xcf, 0xb6, 0x0b, 0x3e, 0x86, 0xf1,
+ 0x8b, 0x0b, 0x75, 0x2d, 0x9d, 0xc3, 0x3f, 0x5c, 0xf0, 0x31, 0x24, 0x39, 0xa0, 0x7b, 0x95, 0x0d,
+ 0x7d, 0xa5, 0x1a, 0x7a, 0x8c, 0x7a, 0xc9, 0xd0, 0xd0, 0x17, 0xaa, 0x21, 0x5b, 0x58, 0x0f, 0x84,
+ 0xfc, 0x11, 0x62, 0x57, 0xaa, 0xa1, 0x33, 0xa4, 0xd6, 0xc9, 0x76, 0x4c, 0x47, 0x72, 0x03, 0xab,
+ 0x5b, 0xad, 0x68, 0xc6, 0x1c, 0xb1, 0xd5, 0xad, 0x58, 0xb0, 0x9a, 0xbc, 0x86, 0x53, 0x64, 0xb4,
+ 0x69, 0x1d, 0x42, 0x0b, 0x84, 0x30, 0x59, 0xc4, 0x24, 0x36, 0xff, 0x19, 0xe0, 0x9f, 0x31, 0xe4,
+ 0x15, 0x2c, 0x95, 0x33, 0x5a, 0x78, 0x89, 0x15, 0x68, 0xc4, 0xd9, 0x11, 0xcd, 0x38, 0xa4, 0xf4,
+ 0x95, 0xd5, 0x71, 0xee, 0x49, 0x31, 0xcd, 0x7d, 0x90, 0xda, 0xfc, 0x84, 0xf5, 0x68, 0xb9, 0x4b,
+ 0xfb, 0x76, 0x0e, 0xf3, 0x71, 0x09, 0x32, 0x5c, 0x82, 0xb7, 0x8f, 0x9e, 0x17, 0x1f, 0x2b, 0xc9,
+ 0x4b, 0x00, 0xd5, 0xd7, 0xa6, 0x3b, 0x68, 0x99, 0xe6, 0xb0, 0xe0, 0x77, 0x32, 0x67, 0x9f, 0xbe,
+ 0x9f, 0xb7, 0x86, 0xd5, 0x37, 0xd6, 0x74, 0x2a, 0x74, 0xcc, 0xd8, 0xb6, 0x1c, 0x03, 0xe3, 0x4a,
+ 0xd5, 0xef, 0xac, 0x28, 0xf1, 0xb1, 0x94, 0xad, 0x29, 0x1f, 0x7c, 0x56, 0xd7, 0x33, 0x64, 0xde,
+ 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x31, 0xce, 0xb6, 0xfc, 0x7a, 0x03, 0x00, 0x00,
}
diff --git a/src/test_platform/skylab_tool/result.proto b/src/test_platform/skylab_tool/result.proto
index 32c6efb..97a85fe 100644
--- a/src/test_platform/skylab_tool/result.proto
+++ b/src/test_platform/skylab_tool/result.proto
@@ -38,17 +38,19 @@
repeated Task child_results = 3 [json_name="child-results"];
message LogDataURL {
- string isolate_url = 1;
+ string isolate_url = 1 [deprecated = true];
+
+ // Google Storage URL, in full "gs://bucket/foo/bar/baz" form
+ string gs_url = 2 [json_name="gs-url"];
}
- LogDataURL log_data_url = 4;
+ LogDataURL log_data_url = 4 [json_name="log-data-url"];
}
// WaitTasksResult describes the format returned by the `skylab wait-tasks` subcommand.
message WaitTasksResult {
repeated WaitTaskResult results = 1;
- // True if an error or timeout was encountered while waiting for tasks
- // to complete.
+ // True if an error or timeout was encountered while waiting for tasks to complete.
bool incomplete = 2;
}
