test_platform: Add map of tests to request and result

BUG=None
TEST=./generate.sh

Change-Id: I8c10c73badf43425597fdfc6c06ba70103cc8de2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/proto/+/2468779
Commit-Queue: Brigit Rossbach <brigitr@google.com>
Reviewed-by: Sean Abraham <seanabraham@chromium.org>
diff --git a/go/test_platform/skylab_test_runner/request.pb.go b/go/test_platform/skylab_test_runner/request.pb.go
index 698ee3d..d8b0a30 100644
--- a/go/test_platform/skylab_test_runner/request.pb.go
+++ b/go/test_platform/skylab_test_runner/request.pb.go
@@ -37,10 +37,13 @@
 	// different UIDs.
 	ParentRequestUid string `protobuf:"bytes,4,opt,name=parent_request_uid,json=parentRequestUid,proto3" json:"parent_request_uid,omitempty"`
 	// The buildbucket ID of the CTP build that sent this test_runner request.
-	ParentBuildId        int64    `protobuf:"varint,5,opt,name=parent_build_id,json=parentBuildId,proto3" json:"parent_build_id,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	ParentBuildId int64 `protobuf:"varint,5,opt,name=parent_build_id,json=parentBuildId,proto3" json:"parent_build_id,omitempty"`
+	// Set of Tests to run. The string is a UUID provided by the client
+	// and used to identify each test result in the response.
+	Tests                map[string]*Request_Test `protobuf:"bytes,6,rep,name=tests,proto3" json:"tests,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
+	XXX_unrecognized     []byte                   `json:"-"`
+	XXX_sizecache        int32                    `json:"-"`
 }
 
 func (m *Request) Reset()         { *m = Request{} }
@@ -103,6 +106,13 @@
 	return 0
 }
 
+func (m *Request) GetTests() map[string]*Request_Test {
+	if m != nil {
+		return m.Tests
+	}
+	return nil
+}
+
 // Prejob defines parameters that affect the steps before the actual test
 // (e.g. provision).
 type Request_Prejob struct {
@@ -368,6 +378,7 @@
 
 func init() {
 	proto.RegisterType((*Request)(nil), "test_platform.skylab_test_runner.Request")
+	proto.RegisterMapType((map[string]*Request_Test)(nil), "test_platform.skylab_test_runner.Request.TestsEntry")
 	proto.RegisterType((*Request_Prejob)(nil), "test_platform.skylab_test_runner.Request.Prejob")
 	proto.RegisterMapType((map[string]string)(nil), "test_platform.skylab_test_runner.Request.Prejob.ProvisionableLabelsEntry")
 	proto.RegisterType((*Request_Test)(nil), "test_platform.skylab_test_runner.Request.Test")
@@ -381,46 +392,48 @@
 }
 
 var fileDescriptor_0203b6078e3ef1f3 = []byte{
-	// 641 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x5d, 0x4f, 0xd4, 0x40,
-	0x14, 0x75, 0x3f, 0xd8, 0x8f, 0x01, 0x91, 0x0c, 0x10, 0x9b, 0xf2, 0xe0, 0x6a, 0x8c, 0xe1, 0xc1,
-	0x4c, 0x0d, 0x26, 0x6a, 0x48, 0x7c, 0x60, 0x05, 0x05, 0x25, 0x42, 0x2a, 0xc4, 0xc4, 0x07, 0x9b,
-	0x59, 0x7a, 0xb7, 0x8c, 0x4c, 0x67, 0xea, 0xdc, 0x29, 0x66, 0x13, 0x7f, 0x8c, 0x6f, 0x26, 0xfe,
-	0x1c, 0x7f, 0x91, 0xe9, 0xb4, 0x25, 0xac, 0x68, 0x70, 0x7d, 0x6b, 0xef, 0x3d, 0xe7, 0xdc, 0x9e,
-	0x7b, 0x4f, 0x4a, 0x98, 0x05, 0xb4, 0x51, 0x26, 0xb9, 0x1d, 0x6b, 0x93, 0x06, 0x78, 0x36, 0x91,
-	0x7c, 0x14, 0xb9, 0xa2, 0xc9, 0x95, 0x02, 0x13, 0x18, 0xf8, 0x9c, 0x03, 0x5a, 0x96, 0x19, 0x6d,
-	0x35, 0x1d, 0x4c, 0xe1, 0xd9, 0x55, 0xbc, 0x7f, 0x27, 0xd1, 0x3a, 0x91, 0x10, 0x38, 0xfc, 0x28,
-	0x1f, 0x07, 0x56, 0xa4, 0x80, 0x96, 0xa7, 0x59, 0x29, 0xe1, 0xaf, 0x4d, 0x8f, 0x9c, 0xd2, 0xbf,
-	0xf7, 0xbd, 0x4f, 0xba, 0x61, 0x59, 0xa1, 0xbb, 0xa4, 0x93, 0x19, 0xf8, 0xa4, 0x47, 0x5e, 0x63,
-	0xd0, 0x58, 0x9f, 0xdf, 0x78, 0xc4, 0xae, 0x1b, 0xce, 0x2a, 0x2a, 0x3b, 0x74, 0xbc, 0xb0, 0xe2,
-	0xd3, 0x21, 0x69, 0x17, 0x28, 0xaf, 0xe9, 0x74, 0xd8, 0xbf, 0xeb, 0x1c, 0x01, 0xda, 0xd0, 0x71,
-	0xe9, 0x13, 0xd2, 0x8b, 0x81, 0xc7, 0x52, 0x28, 0xf0, 0x5a, 0x4e, 0xc7, 0x67, 0xa5, 0x55, 0x56,
-	0x5b, 0x65, 0x47, 0xb5, 0xd5, 0xf0, 0x02, 0x4b, 0x1f, 0x12, 0x9a, 0x71, 0x03, 0xca, 0x46, 0x95,
-	0xd3, 0x28, 0x17, 0xb1, 0xd7, 0x1e, 0x34, 0xd6, 0xfb, 0xe1, 0x52, 0xd9, 0xa9, 0xa6, 0x1d, 0x8b,
-	0x98, 0x3e, 0x20, 0xb7, 0x2a, 0xf4, 0x28, 0x17, 0x32, 0x8e, 0x44, 0xec, 0xcd, 0x0d, 0x1a, 0xeb,
-	0xad, 0xf0, 0x66, 0x59, 0x1e, 0x16, 0xd5, 0xbd, 0xd8, 0xff, 0xd9, 0x24, 0x9d, 0xd2, 0x24, 0x15,
-	0x64, 0x15, 0xf5, 0xd8, 0x7e, 0xe1, 0x06, 0xa2, 0x18, 0x32, 0x50, 0x31, 0xa8, 0x13, 0x01, 0xe8,
-	0x35, 0x06, 0xad, 0x3f, 0x6c, 0xed, 0x62, 0x45, 0xdc, 0xf0, 0x14, 0xd9, 0xbb, 0x8a, 0xba, 0x5d,
-	0x33, 0x27, 0xc3, 0xa6, 0xd7, 0x08, 0x57, 0xf0, 0xf7, 0xba, 0x00, 0xa4, 0x5f, 0xc9, 0x4a, 0x66,
-	0xf4, 0xb9, 0x40, 0xa1, 0x15, 0x1f, 0x49, 0x88, 0x24, 0x1f, 0x81, 0x44, 0xaf, 0xe9, 0x26, 0xed,
-	0xcd, 0x7a, 0x1f, 0x76, 0x78, 0x59, 0x6c, 0xdf, 0x69, 0xed, 0x28, 0x6b, 0x26, 0xe1, 0x72, 0x76,
-	0xb5, 0x43, 0x6f, 0x93, 0x6e, 0x8e, 0x10, 0x59, 0x89, 0xee, 0x00, 0xbd, 0xb0, 0x93, 0x23, 0x1c,
-	0x49, 0xf4, 0x5f, 0x12, 0xef, 0x6f, 0x4a, 0x74, 0x89, 0xb4, 0xce, 0x60, 0xe2, 0x12, 0xd4, 0x0f,
-	0x8b, 0x47, 0xba, 0x42, 0xe6, 0xce, 0xb9, 0xcc, 0xc1, 0xa5, 0xa1, 0x1f, 0x96, 0x2f, 0x9b, 0xcd,
-	0x67, 0x0d, 0xff, 0x47, 0x9b, 0xb4, 0x8b, 0x8b, 0xd3, 0x63, 0xd2, 0xe3, 0xb9, 0xd5, 0x2e, 0x33,
-	0x65, 0xf6, 0x9e, 0xce, 0x96, 0x19, 0xb6, 0x55, 0xd1, 0x77, 0x6f, 0x84, 0x17, 0x52, 0xf4, 0x3d,
-	0xe9, 0xea, 0xf1, 0x58, 0x6a, 0x1e, 0x57, 0x49, 0x7c, 0x3e, 0xa3, 0xea, 0x41, 0xc9, 0x3e, 0xc8,
-	0xac, 0xd0, 0x0a, 0xc3, 0x5a, 0xcd, 0xff, 0xd6, 0x24, 0xbd, 0x7a, 0x22, 0xa5, 0xa4, 0xad, 0x78,
-	0x0a, 0x95, 0x65, 0xf7, 0x4c, 0xd7, 0x48, 0xdf, 0x89, 0x72, 0x93, 0x60, 0xe5, 0xbb, 0x57, 0x14,
-	0xb6, 0x4c, 0x82, 0xf4, 0x23, 0xe9, 0x9e, 0xc1, 0xe4, 0x9c, 0xbb, 0xbd, 0x16, 0x87, 0xdc, 0xfe,
-	0x4f, 0xb3, 0xec, 0x4d, 0x29, 0x53, 0xde, 0xb0, 0x16, 0xa5, 0xf7, 0xc9, 0xa2, 0xc0, 0xe8, 0x44,
-	0x8a, 0x22, 0xd6, 0x6e, 0xa7, 0x6d, 0x77, 0xbe, 0x05, 0x81, 0x2f, 0x5c, 0xd1, 0xed, 0xfc, 0x2e,
-	0x59, 0x88, 0x05, 0x66, 0x92, 0x4f, 0x22, 0xf7, 0xf9, 0x73, 0xee, 0x2b, 0xe7, 0xab, 0xda, 0x5b,
-	0x9e, 0x82, 0xbf, 0x49, 0x16, 0x2e, 0x4f, 0x98, 0xe9, 0xb6, 0xdb, 0x64, 0x71, 0x7a, 0x7b, 0x74,
-	0x83, 0xac, 0xe2, 0x44, 0x9d, 0x9c, 0x1a, 0xad, 0x74, 0x8e, 0x51, 0x82, 0x11, 0xb8, 0xf4, 0x38,
-	0xbd, 0x5e, 0xb8, 0x7c, 0xa9, 0xf9, 0x0a, 0x77, 0x5c, 0x6b, 0xd8, 0x27, 0xdd, 0x53, 0x6e, 0x14,
-	0x20, 0x0e, 0xf7, 0x3f, 0xbc, 0x4e, 0x34, 0x2b, 0x10, 0xa9, 0xc8, 0x53, 0xa6, 0x4d, 0x12, 0xd4,
-	0x2f, 0x1a, 0x03, 0xa1, 0xc6, 0x86, 0x97, 0xff, 0xc0, 0x20, 0xd1, 0xc1, 0x75, 0x7f, 0xd9, 0x51,
-	0xc7, 0x41, 0x1f, 0xff, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x66, 0xa2, 0xb4, 0x90, 0x05, 0x00,
-	0x00,
+	// 682 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x95, 0xcf, 0x6e, 0xd3, 0x4e,
+	0x10, 0xc7, 0x7f, 0xf9, 0x9f, 0x4c, 0xfb, 0x2b, 0xd5, 0xb6, 0x15, 0x96, 0x7b, 0x20, 0x20, 0x84,
+	0x72, 0x40, 0x6b, 0x54, 0x10, 0xa0, 0x4a, 0x1c, 0x1a, 0x52, 0x68, 0x4b, 0x45, 0x2b, 0xd3, 0x0a,
+	0x89, 0x03, 0xd6, 0xa6, 0x9e, 0xb8, 0x4b, 0x6d, 0xaf, 0xd9, 0xb1, 0x8b, 0x22, 0xf1, 0x30, 0x9c,
+	0x79, 0x1c, 0xee, 0xbc, 0x0b, 0xf2, 0xda, 0x69, 0x93, 0x16, 0x54, 0xc2, 0xcd, 0x9e, 0x9d, 0xf9,
+	0xcc, 0x7c, 0x67, 0xc6, 0x6b, 0xe0, 0x29, 0x52, 0xea, 0x25, 0xa1, 0x48, 0x47, 0x4a, 0x47, 0x0e,
+	0x9d, 0x8d, 0x43, 0x31, 0xf4, 0x8c, 0x51, 0x67, 0x71, 0x8c, 0xda, 0xd1, 0xf8, 0x39, 0x43, 0x4a,
+	0x79, 0xa2, 0x55, 0xaa, 0x58, 0x77, 0xc6, 0x9f, 0x5f, 0xf7, 0xb7, 0xef, 0x04, 0x4a, 0x05, 0x21,
+	0x3a, 0xc6, 0x7f, 0x98, 0x8d, 0x9c, 0x54, 0x46, 0x48, 0xa9, 0x88, 0x92, 0x02, 0x61, 0xaf, 0xcf,
+	0xa6, 0x9c, 0xe1, 0xdf, 0xfb, 0x09, 0xd0, 0x72, 0x0b, 0x0b, 0xdb, 0x81, 0x66, 0xa2, 0xf1, 0x93,
+	0x1a, 0x5a, 0x95, 0x6e, 0xa5, 0xb7, 0xb0, 0xf1, 0x88, 0xdf, 0x94, 0x9c, 0x97, 0xa1, 0xfc, 0xd0,
+	0xc4, 0xb9, 0x65, 0x3c, 0xeb, 0x43, 0x3d, 0xf7, 0xb2, 0xaa, 0x86, 0xc3, 0xff, 0x9e, 0x73, 0x84,
+	0x94, 0xba, 0x26, 0x96, 0x3d, 0x85, 0xb6, 0x8f, 0xc2, 0x0f, 0x65, 0x8c, 0x56, 0xcd, 0x70, 0x6c,
+	0x5e, 0x48, 0xe5, 0x13, 0xa9, 0xfc, 0x68, 0x22, 0xd5, 0xbd, 0xf0, 0x65, 0x0f, 0x81, 0x25, 0x42,
+	0x63, 0x9c, 0x7a, 0xa5, 0x52, 0x2f, 0x93, 0xbe, 0x55, 0xef, 0x56, 0x7a, 0x1d, 0x77, 0xb9, 0x38,
+	0x29, 0xb3, 0x1d, 0x4b, 0x9f, 0x3d, 0x80, 0x5b, 0xa5, 0xf7, 0x30, 0x93, 0xa1, 0xef, 0x49, 0xdf,
+	0x6a, 0x74, 0x2b, 0xbd, 0x9a, 0xfb, 0x7f, 0x61, 0xee, 0xe7, 0xd6, 0x5d, 0x9f, 0xed, 0x41, 0x23,
+	0xaf, 0x8a, 0xac, 0x66, 0xb7, 0xd6, 0x5b, 0xd8, 0x78, 0x32, 0x9f, 0x24, 0xda, 0x8e, 0x53, 0x3d,
+	0x76, 0x0b, 0x84, 0xfd, 0xa3, 0x0a, 0xcd, 0xa2, 0x61, 0x4c, 0xc2, 0x1a, 0xa9, 0x51, 0xfa, 0x45,
+	0x68, 0xf4, 0x7c, 0x4c, 0x30, 0xf6, 0x31, 0x3e, 0x91, 0x48, 0x56, 0xc5, 0xa4, 0xb9, 0x3a, 0x81,
+	0x8b, 0x76, 0x0b, 0x2d, 0x22, 0xe2, 0xef, 0xca, 0xd0, 0xc1, 0x24, 0x72, 0xdc, 0xaf, 0x5a, 0x15,
+	0x77, 0x95, 0xae, 0xda, 0x25, 0x12, 0xfb, 0x0a, 0xab, 0x89, 0x56, 0xe7, 0x92, 0xa4, 0x8a, 0xc5,
+	0x30, 0x44, 0x2f, 0x14, 0x43, 0x0c, 0xc9, 0xaa, 0x9a, 0x4c, 0xbb, 0xf3, 0xce, 0x9a, 0x1f, 0x4e,
+	0xc3, 0xf6, 0x0d, 0xab, 0x50, 0xb9, 0x92, 0x5c, 0x3f, 0x61, 0xb7, 0xa1, 0x95, 0x11, 0x7a, 0x69,
+	0x48, 0x66, 0x98, 0x6d, 0xb7, 0x99, 0x11, 0x1e, 0x85, 0x64, 0xbf, 0x02, 0xeb, 0x4f, 0x24, 0xb6,
+	0x0c, 0xb5, 0x33, 0x1c, 0x9b, 0x6d, 0xec, 0xb8, 0xf9, 0x23, 0x5b, 0x85, 0xc6, 0xb9, 0x08, 0x33,
+	0x34, 0x9b, 0xd5, 0x71, 0x8b, 0x97, 0xcd, 0xea, 0xf3, 0x8a, 0xfd, 0xbd, 0x0e, 0xf5, 0xbc, 0xd5,
+	0xec, 0x18, 0xda, 0x22, 0x4b, 0x95, 0xd9, 0xbf, 0x62, 0x8f, 0x9f, 0xcd, 0x37, 0x2c, 0xbe, 0x55,
+	0x86, 0xef, 0xfc, 0xe7, 0x5e, 0xa0, 0xd8, 0x7b, 0x68, 0xa9, 0xd1, 0x28, 0x54, 0xc2, 0x2f, 0xb7,
+	0xfa, 0xc5, 0x9c, 0xd4, 0x83, 0x22, 0xfa, 0x20, 0x49, 0xa5, 0x8a, 0xc9, 0x9d, 0xd0, 0xec, 0x6f,
+	0x55, 0x68, 0x4f, 0x32, 0x32, 0x06, 0xf5, 0x58, 0x44, 0x58, 0x4a, 0x36, 0xcf, 0x6c, 0x1d, 0x3a,
+	0x06, 0x2a, 0x74, 0x40, 0xa5, 0xee, 0x76, 0x6e, 0xd8, 0xd2, 0x01, 0xb1, 0x8f, 0xd0, 0x3a, 0xc3,
+	0xf1, 0xb9, 0x30, 0x7d, 0xcd, 0x07, 0x39, 0xf8, 0x47, 0xb1, 0xfc, 0x4d, 0x81, 0x29, 0x66, 0x38,
+	0x81, 0xb2, 0xfb, 0xb0, 0x24, 0xc9, 0x3b, 0x09, 0x65, 0xfe, 0x89, 0x98, 0x9e, 0xd6, 0xcd, 0xf8,
+	0x16, 0x25, 0xbd, 0x34, 0x46, 0xd3, 0xf3, 0xbb, 0xb0, 0xe8, 0x4b, 0x4a, 0x42, 0x31, 0xf6, 0x4c,
+	0xf9, 0x0d, 0x53, 0xe5, 0x42, 0x69, 0x7b, 0x2b, 0x22, 0xb4, 0x37, 0x61, 0x71, 0x3a, 0xc3, 0x5c,
+	0xb3, 0x1d, 0xc0, 0xd2, 0x6c, 0xf7, 0xd8, 0x06, 0xac, 0xd1, 0x38, 0x3e, 0x39, 0xd5, 0x2a, 0x56,
+	0x19, 0x79, 0x01, 0x79, 0x68, 0xb6, 0xc7, 0xf0, 0xda, 0xee, 0xca, 0xd4, 0xe1, 0x6b, 0xda, 0x36,
+	0x47, 0xfd, 0x0e, 0xb4, 0x4e, 0x85, 0x8e, 0x91, 0xc8, 0x3e, 0x05, 0xb8, 0xfc, 0x2c, 0x7f, 0x53,
+	0xca, 0x60, 0xba, 0x94, 0xf9, 0x2f, 0xb0, 0xcb, 0xd2, 0xfb, 0xfb, 0x1f, 0xf6, 0x02, 0xc5, 0xf3,
+	0x5a, 0x22, 0x99, 0x45, 0x5c, 0xe9, 0xc0, 0x99, 0xbc, 0x28, 0x72, 0x64, 0x3c, 0xd2, 0xa2, 0xb8,
+	0xb9, 0x9d, 0x40, 0x39, 0x37, 0xfd, 0x1b, 0x86, 0x4d, 0xe3, 0xfa, 0xf8, 0x57, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xdd, 0xa7, 0x99, 0x1b, 0x46, 0x06, 0x00, 0x00,
 }
diff --git a/go/test_platform/skylab_test_runner/result.pb.go b/go/test_platform/skylab_test_runner/result.pb.go
index fcf9db4..b10cca0 100644
--- a/go/test_platform/skylab_test_runner/result.pb.go
+++ b/go/test_platform/skylab_test_runner/result.pb.go
@@ -141,14 +141,17 @@
 	//
 	// Types that are valid to be assigned to Harness:
 	//	*Result_AutotestResult
-	Harness              isResult_Harness    `protobuf_oneof:"harness"`
-	Prejob               *Result_Prejob      `protobuf:"bytes,2,opt,name=prejob,proto3" json:"prejob,omitempty"`
-	LogData              *common.TaskLogData `protobuf:"bytes,3,opt,name=log_data,json=logData,proto3" json:"log_data,omitempty"`
-	StateUpdate          *Result_StateUpdate `protobuf:"bytes,4,opt,name=state_update,json=stateUpdate,proto3" json:"state_update,omitempty"`
-	AsyncResults         *AsyncResults       `protobuf:"bytes,5,opt,name=async_results,json=asyncResults,proto3" json:"async_results,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
-	XXX_unrecognized     []byte              `json:"-"`
-	XXX_sizecache        int32               `json:"-"`
+	Harness      isResult_Harness    `protobuf_oneof:"harness"`
+	Prejob       *Result_Prejob      `protobuf:"bytes,2,opt,name=prejob,proto3" json:"prejob,omitempty"`
+	LogData      *common.TaskLogData `protobuf:"bytes,3,opt,name=log_data,json=logData,proto3" json:"log_data,omitempty"`
+	StateUpdate  *Result_StateUpdate `protobuf:"bytes,4,opt,name=state_update,json=stateUpdate,proto3" json:"state_update,omitempty"`
+	AsyncResults *AsyncResults       `protobuf:"bytes,5,opt,name=async_results,json=asyncResults,proto3" json:"async_results,omitempty"`
+	// Set of test results. The string is a UUID used to identify each test, and
+	// comes from the client.
+	AutotestResults      map[string]*Result_Autotest `protobuf:"bytes,6,rep,name=autotest_results,json=autotestResults,proto3" json:"autotest_results,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
+	XXX_unrecognized     []byte                      `json:"-"`
+	XXX_sizecache        int32                       `json:"-"`
 }
 
 func (m *Result) Reset()         { *m = Result{} }
@@ -228,6 +231,13 @@
 	return nil
 }
 
+func (m *Result) GetAutotestResults() map[string]*Result_Autotest {
+	if m != nil {
+		return m.AutotestResults
+	}
+	return nil
+}
+
 // XXX_OneofWrappers is for the internal use of the proto package.
 func (*Result) XXX_OneofWrappers() []interface{} {
 	return []interface{}{
@@ -505,6 +515,7 @@
 	proto.RegisterEnum("test_platform.skylab_test_runner.Result_Prejob_Step_Verdict", Result_Prejob_Step_Verdict_name, Result_Prejob_Step_Verdict_value)
 	proto.RegisterType((*AsyncResults)(nil), "test_platform.skylab_test_runner.AsyncResults")
 	proto.RegisterType((*Result)(nil), "test_platform.skylab_test_runner.Result")
+	proto.RegisterMapType((map[string]*Result_Autotest)(nil), "test_platform.skylab_test_runner.Result.AutotestResultsEntry")
 	proto.RegisterType((*Result_Autotest)(nil), "test_platform.skylab_test_runner.Result.Autotest")
 	proto.RegisterType((*Result_Autotest_TestCase)(nil), "test_platform.skylab_test_runner.Result.Autotest.TestCase")
 	proto.RegisterType((*Result_Prejob)(nil), "test_platform.skylab_test_runner.Result.Prejob")
@@ -517,44 +528,48 @@
 }
 
 var fileDescriptor_e702ec909b65d32c = []byte{
-	// 622 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x6f, 0x4f, 0x13, 0x4f,
-	0x10, 0xc7, 0xe9, 0x1f, 0xfa, 0x67, 0xda, 0x1f, 0xbf, 0xba, 0x11, 0x52, 0x6b, 0xa2, 0xc8, 0x23,
-	0x62, 0xe2, 0x5e, 0xac, 0x24, 0x26, 0x86, 0x07, 0x16, 0x0a, 0x82, 0x21, 0x48, 0xf6, 0x28, 0x46,
-	0x43, 0x72, 0xd9, 0xf6, 0x96, 0x52, 0xb9, 0xbb, 0xbd, 0xec, 0xee, 0x99, 0xf0, 0x2e, 0x7c, 0x4f,
-	0xbe, 0x02, 0xdf, 0x87, 0xf1, 0x35, 0x98, 0x9b, 0xdb, 0x8b, 0x07, 0x9a, 0x14, 0x08, 0xcf, 0x76,
-	0x66, 0x76, 0x3e, 0x3b, 0xfb, 0x9d, 0xd9, 0x85, 0x17, 0x46, 0x68, 0xe3, 0xc5, 0x01, 0x37, 0x67,
-	0x52, 0x85, 0x8e, 0xbe, 0xb8, 0x0c, 0xf8, 0xd8, 0x43, 0xa7, 0x4a, 0xa2, 0x48, 0x28, 0x47, 0x09,
-	0x9d, 0x04, 0x86, 0xc6, 0x4a, 0x1a, 0x49, 0x56, 0xaf, 0x6c, 0xa7, 0x7f, 0x6f, 0xef, 0x3d, 0xbd,
-	0x0a, 0x9c, 0xc8, 0x30, 0x94, 0x91, 0x63, 0xb8, 0xbe, 0xc8, 0x10, 0x6b, 0x6f, 0xa1, 0x3d, 0xd0,
-	0x97, 0xd1, 0x84, 0x21, 0x57, 0x93, 0x47, 0xd0, 0x08, 0xe4, 0x54, 0x7b, 0x89, 0x0a, 0xba, 0xa5,
-	0xd5, 0xd2, 0x7a, 0x93, 0xd5, 0x53, 0x7b, 0xa4, 0x02, 0xb2, 0x0c, 0x35, 0x1b, 0x28, 0x63, 0x60,
-	0x11, 0xdd, 0x6b, 0x3f, 0x9b, 0x50, 0xcb, 0xb2, 0xc9, 0x29, 0xfc, 0xcf, 0x13, 0x23, 0xb3, 0x02,
-	0xd0, 0x85, 0x8c, 0x56, 0xff, 0x25, 0x9d, 0x57, 0x29, 0xcd, 0x10, 0x74, 0x60, 0xf3, 0xf7, 0x16,
-	0xd8, 0x52, 0xce, 0xb2, 0xf4, 0x77, 0x50, 0x8b, 0x95, 0xf8, 0x22, 0xc7, 0x78, 0x7e, 0xab, 0xef,
-	0xdc, 0x18, 0x7a, 0x84, 0x69, 0xcc, 0xa6, 0x93, 0x4d, 0xbc, 0xa3, 0xe7, 0x73, 0xc3, 0xbb, 0x15,
-	0x44, 0x3d, 0xbb, 0x86, 0xca, 0x74, 0xa2, 0xc7, 0x5c, 0x5f, 0x1c, 0xc8, 0xe9, 0x90, 0x1b, 0x8e,
-	0x32, 0xa4, 0x0b, 0xf2, 0x11, 0xda, 0xda, 0x70, 0x23, 0xbc, 0x24, 0xf6, 0xb9, 0x11, 0xdd, 0x2a,
-	0x12, 0x36, 0x6e, 0x5c, 0x8c, 0x9b, 0x26, 0x8f, 0x30, 0x97, 0xb5, 0xf4, 0x1f, 0x83, 0xb8, 0xf0,
-	0x1f, 0x4f, 0x5b, 0x61, 0xa5, 0xd3, 0xdd, 0x45, 0x24, 0xd3, 0xf9, 0xe4, 0x62, 0x07, 0x59, 0x9b,
-	0x17, 0xac, 0xde, 0x8f, 0x0a, 0x34, 0x72, 0x4d, 0xc9, 0x27, 0x00, 0x4c, 0x9b, 0x70, 0x2d, 0x74,
-	0xb7, 0xb4, 0x5a, 0x59, 0x6f, 0xf5, 0xdf, 0xdc, 0xba, 0x35, 0xf4, 0x58, 0x68, 0xb3, 0xcd, 0xb5,
-	0x60, 0x4d, 0x63, 0x57, 0x9a, 0x3c, 0x01, 0x98, 0x45, 0x13, 0x19, 0xc6, 0x81, 0x30, 0x02, 0x1b,
-	0xd4, 0x60, 0x05, 0x0f, 0x79, 0x0d, 0xdd, 0xb4, 0xac, 0x73, 0x25, 0x23, 0x99, 0x68, 0x2f, 0xd7,
-	0x1f, 0xc7, 0xa9, 0x82, 0xe3, 0xb4, 0x5c, 0x88, 0x5b, 0xd1, 0x47, 0x2a, 0xe8, 0x7d, 0x2b, 0x43,
-	0x23, 0x3f, 0x90, 0x10, 0xa8, 0x46, 0x3c, 0x14, 0x76, 0x32, 0x71, 0x4d, 0x4e, 0xa1, 0xfe, 0x55,
-	0x28, 0x7f, 0x36, 0x31, 0x78, 0xec, 0x52, 0x7f, 0xeb, 0xee, 0x37, 0xa2, 0x27, 0x19, 0x89, 0xe5,
-	0x48, 0xb2, 0x01, 0x2b, 0xe7, 0x49, 0xc8, 0x23, 0x4f, 0x09, 0xee, 0xf3, 0x71, 0x20, 0x3c, 0x9d,
-	0x84, 0x21, 0x57, 0x97, 0xb6, 0xea, 0x87, 0x18, 0x65, 0x36, 0xe8, 0x66, 0xb1, 0xb5, 0x53, 0xa8,
-	0x5b, 0x12, 0x59, 0x86, 0x07, 0x27, 0x3b, 0x6c, 0xb8, 0xbf, 0x7d, 0xec, 0x8d, 0x0e, 0x87, 0x3b,
-	0xbb, 0xfb, 0x87, 0x3b, 0xc3, 0xce, 0x02, 0xe9, 0x40, 0x3b, 0x77, 0x1f, 0x0d, 0x5c, 0xb7, 0x53,
-	0x2a, 0x7a, 0x76, 0x07, 0xfb, 0x07, 0x9d, 0x32, 0x59, 0x01, 0x92, 0x7b, 0x0e, 0x3f, 0x78, 0x76,
-	0xd9, 0xa9, 0xf4, 0xbe, 0x97, 0xa1, 0x96, 0x8d, 0x34, 0xd9, 0x83, 0xaa, 0x36, 0x22, 0xb6, 0xbd,
-	0xdc, 0xb8, 0xe5, 0x8b, 0xa0, 0xae, 0x11, 0x31, 0x43, 0x42, 0xef, 0x57, 0x09, 0xaa, 0xa9, 0xf9,
-	0x4f, 0x8d, 0x4f, 0xae, 0x6b, 0xbc, 0x79, 0x97, 0x93, 0xee, 0x4b, 0xdd, 0xe1, 0x7d, 0xa8, 0xdb,
-	0x7b, 0x0e, 0xad, 0xc2, 0x53, 0x24, 0x8f, 0xa1, 0xe9, 0x27, 0xc6, 0xc3, 0x07, 0x69, 0xef, 0xde,
-	0xf0, 0x13, 0x83, 0x5b, 0xb6, 0x9a, 0x50, 0x3f, 0xe7, 0x2a, 0x12, 0x5a, 0x6f, 0x1d, 0x7c, 0x7e,
-	0x3f, 0x95, 0x34, 0x1d, 0xd4, 0x70, 0x96, 0x84, 0x54, 0xaa, 0xa9, 0x93, 0x1b, 0x52, 0x3b, 0xb3,
-	0xe8, 0x4c, 0x71, 0x07, 0xbf, 0x56, 0x67, 0x2a, 0x9d, 0x79, 0xdf, 0xf9, 0xb8, 0x86, 0x5b, 0x5f,
-	0xfd, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x5f, 0x3a, 0xf4, 0x59, 0xf9, 0x05, 0x00, 0x00,
+	// 679 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0xed, 0x4a, 0x1b, 0x4d,
+	0x14, 0xc7, 0xcd, 0x8b, 0x79, 0x39, 0xc9, 0xa3, 0x79, 0x06, 0x95, 0x74, 0x0b, 0xad, 0xf5, 0x93,
+	0x14, 0xba, 0x4b, 0x53, 0xa1, 0x45, 0x2c, 0x34, 0x9a, 0xf8, 0x52, 0xc4, 0xca, 0xc4, 0x58, 0x5a,
+	0x84, 0x65, 0x92, 0x8c, 0x49, 0x9a, 0xdd, 0x9d, 0x65, 0x66, 0x56, 0xc8, 0x5d, 0xf4, 0x9e, 0xfa,
+	0xb9, 0x1f, 0x7a, 0x23, 0xbd, 0x86, 0xb2, 0x67, 0x67, 0x69, 0xb4, 0x82, 0x46, 0xfc, 0x36, 0x73,
+	0x5e, 0x7e, 0x67, 0xe6, 0xfc, 0xe7, 0xec, 0xc2, 0x2b, 0xcd, 0x95, 0x76, 0x43, 0x8f, 0xe9, 0x4b,
+	0x21, 0x7d, 0x47, 0x4d, 0xa6, 0x1e, 0xeb, 0xb9, 0x68, 0x94, 0x51, 0x10, 0x70, 0xe9, 0x48, 0xae,
+	0x22, 0x4f, 0xdb, 0xa1, 0x14, 0x5a, 0x90, 0xf5, 0x6b, 0xe1, 0xf6, 0xbf, 0xe1, 0xd6, 0xf3, 0xeb,
+	0xc0, 0xbe, 0xf0, 0x7d, 0x11, 0x38, 0x9a, 0xa9, 0x49, 0x82, 0xd8, 0xf8, 0x00, 0xd5, 0xa6, 0x9a,
+	0x06, 0x7d, 0x8a, 0x5c, 0x45, 0x9e, 0x40, 0xc9, 0x13, 0x43, 0xe5, 0x46, 0xd2, 0xab, 0x67, 0xd6,
+	0x33, 0x9b, 0x65, 0x5a, 0x8c, 0xf7, 0x5d, 0xe9, 0x91, 0x55, 0x28, 0x18, 0x47, 0x16, 0x1d, 0x8b,
+	0x68, 0xde, 0xf8, 0x59, 0x81, 0x42, 0x92, 0x4d, 0x2e, 0x60, 0x99, 0x45, 0x5a, 0x24, 0x07, 0x40,
+	0x13, 0x32, 0x2a, 0x8d, 0xd7, 0xf6, 0x5d, 0x27, 0xb5, 0x13, 0x84, 0xdd, 0x34, 0xf9, 0x87, 0x0b,
+	0x74, 0x29, 0x65, 0x19, 0xfa, 0x01, 0x14, 0x42, 0xc9, 0xbf, 0x89, 0x1e, 0xd6, 0xaf, 0x34, 0x9c,
+	0x7b, 0x43, 0x4f, 0x31, 0x8d, 0x9a, 0x74, 0xb2, 0x83, 0x77, 0x74, 0x07, 0x4c, 0xb3, 0x7a, 0x0e,
+	0x51, 0x2f, 0x6e, 0xa0, 0x92, 0x3e, 0xd9, 0x67, 0x4c, 0x4d, 0x8e, 0xc5, 0xb0, 0xc5, 0x34, 0xc3,
+	0x36, 0xc4, 0x0b, 0xf2, 0x19, 0xaa, 0x4a, 0x33, 0xcd, 0xdd, 0x28, 0x1c, 0x30, 0xcd, 0xeb, 0x79,
+	0x24, 0x6c, 0xdd, 0xfb, 0x30, 0x9d, 0x38, 0xb9, 0x8b, 0xb9, 0xb4, 0xa2, 0xfe, 0x6e, 0x48, 0x07,
+	0xfe, 0x63, 0xb1, 0x14, 0xa6, 0x75, 0xaa, 0xbe, 0x88, 0x64, 0xfb, 0x6e, 0xf2, 0xac, 0x82, 0xb4,
+	0xca, 0x66, 0xf5, 0x1c, 0x41, 0xed, 0x86, 0x24, 0xaa, 0x5e, 0x58, 0xcf, 0x6d, 0x56, 0x1a, 0xef,
+	0xe7, 0xd6, 0xc4, 0x30, 0xdb, 0x81, 0x96, 0x53, 0xba, 0x7c, 0x5d, 0x1d, 0x65, 0xfd, 0xca, 0x41,
+	0x29, 0x8d, 0x24, 0x5f, 0x00, 0x10, 0xd4, 0x67, 0x8a, 0xab, 0x7a, 0x06, 0x0b, 0x6e, 0xcf, 0x5d,
+	0xd0, 0x3e, 0xe3, 0x4a, 0xef, 0x31, 0xc5, 0x69, 0x59, 0x9b, 0x95, 0x22, 0xcf, 0x00, 0xc6, 0x41,
+	0x5f, 0xf8, 0xa1, 0xc7, 0x35, 0xc7, 0xa7, 0x50, 0xa2, 0x33, 0x16, 0xf2, 0x16, 0xea, 0x71, 0x03,
+	0x46, 0x52, 0x04, 0x22, 0x52, 0x6e, 0xaa, 0x34, 0x3e, 0xdc, 0x1c, 0x3e, 0xdc, 0xd5, 0x19, 0xbf,
+	0x91, 0xb7, 0x2b, 0x3d, 0xeb, 0x7b, 0x16, 0x4a, 0x69, 0x41, 0x42, 0x20, 0x1f, 0x30, 0x9f, 0x9b,
+	0x19, 0xc0, 0x35, 0xb9, 0x80, 0xe2, 0x15, 0x97, 0x83, 0x71, 0x5f, 0x63, 0xd9, 0xa5, 0xc6, 0xee,
+	0xc3, 0x6f, 0x64, 0x9f, 0x27, 0x24, 0x9a, 0x22, 0xc9, 0x16, 0xac, 0x8d, 0x22, 0x9f, 0x05, 0xae,
+	0xe4, 0x6c, 0xc0, 0x7a, 0x1e, 0x77, 0x55, 0xe4, 0xfb, 0x4c, 0x4e, 0xcd, 0xa9, 0x57, 0xd0, 0x4b,
+	0x8d, 0xb3, 0x93, 0xf8, 0x36, 0x2e, 0xa0, 0x68, 0x48, 0x64, 0x15, 0xfe, 0x3f, 0x6f, 0xd3, 0xd6,
+	0xd1, 0xde, 0x99, 0xdb, 0x3d, 0x69, 0xb5, 0xf7, 0x8f, 0x4e, 0xda, 0xad, 0xda, 0x02, 0xa9, 0x41,
+	0x35, 0x35, 0x9f, 0x36, 0x3b, 0x9d, 0x5a, 0x66, 0xd6, 0xb2, 0xdf, 0x3c, 0x3a, 0xae, 0x65, 0xc9,
+	0x1a, 0x90, 0xd4, 0x72, 0xf2, 0xc9, 0x35, 0xcb, 0x5a, 0xce, 0xfa, 0x91, 0x85, 0x42, 0x32, 0x3c,
+	0xe4, 0x10, 0xf2, 0x4a, 0xf3, 0xd0, 0x68, 0xb9, 0x35, 0xe7, 0xec, 0xd9, 0x1d, 0xcd, 0x43, 0x8a,
+	0x04, 0xeb, 0x77, 0x06, 0xf2, 0xf1, 0xf6, 0xd6, 0x1e, 0x9f, 0xdf, 0xec, 0xf1, 0xce, 0x43, 0x2a,
+	0x3d, 0x56, 0x77, 0x5b, 0x8f, 0xd1, 0x5d, 0xeb, 0x25, 0x54, 0x66, 0x86, 0x9e, 0x3c, 0x85, 0xf2,
+	0x20, 0xd2, 0x2e, 0x8e, 0xbe, 0xb9, 0x7b, 0x69, 0x10, 0x69, 0x0c, 0xb1, 0x22, 0x58, 0xb9, 0x6d,
+	0xdc, 0x48, 0x0d, 0x72, 0x13, 0x3e, 0x35, 0xe1, 0xf1, 0x92, 0x1c, 0xc0, 0xe2, 0x15, 0xf3, 0x22,
+	0x6e, 0xbe, 0x86, 0xf3, 0x7f, 0x62, 0x69, 0x92, 0xbf, 0x9d, 0x7d, 0x97, 0xd9, 0x2d, 0x43, 0x71,
+	0xc4, 0x64, 0xc0, 0x95, 0xda, 0x3d, 0xfe, 0xfa, 0x71, 0x28, 0xec, 0x78, 0x3e, 0xfc, 0x71, 0xe4,
+	0xdb, 0x42, 0x0e, 0x9d, 0x74, 0x23, 0x94, 0x33, 0x0e, 0x2e, 0x25, 0x73, 0xf0, 0xdf, 0xe1, 0x0c,
+	0x85, 0x73, 0xd7, 0xff, 0xaa, 0x57, 0xc0, 0xd0, 0x37, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xbc,
+	0x2a, 0xde, 0x5c, 0xda, 0x06, 0x00, 0x00,
 }
diff --git a/src/test_platform/skylab_test_runner/request.proto b/src/test_platform/skylab_test_runner/request.proto
index fb91345..7b9d6b5 100644
--- a/src/test_platform/skylab_test_runner/request.proto
+++ b/src/test_platform/skylab_test_runner/request.proto
@@ -87,4 +87,7 @@
   // The buildbucket ID of the CTP build that sent this test_runner request.
   int64 parent_build_id = 5;
 
+  // Set of Tests to run. The string is a UUID provided by the client
+  // and used to identify each test result in the response.
+  map<string, Test> tests = 6;
 }
diff --git a/src/test_platform/skylab_test_runner/result.proto b/src/test_platform/skylab_test_runner/result.proto
index 85457bf..ef7dba8 100644
--- a/src/test_platform/skylab_test_runner/result.proto
+++ b/src/test_platform/skylab_test_runner/result.proto
@@ -105,5 +105,9 @@
   StateUpdate state_update = 4;
 
   AsyncResults async_results = 5;
+
+  // Set of test results. The string is a UUID used to identify each test, and
+  // comes from the client.
+  map<string, Autotest> autotest_results = 6;
 }