test_platform: Add structured software_dependencies in test_runner
BUG=chromium:1162347
TEST=./generate.sh
Change-Id: I6e0b021d531386029c672471215a1ee70636667b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/proto/+/2606031
Commit-Queue: Prathmesh Prabhu <pprabhu@google.com>
Commit-Queue: Brigit Rossbach <brigitr@google.com>
Auto-Submit: Prathmesh Prabhu <pprabhu@google.com>
Reviewed-by: Brigit Rossbach <brigitr@google.com>
diff --git a/go/test_platform/phosphorus/prejob.pb.go b/go/test_platform/phosphorus/prejob.pb.go
index ec8e136..3824078 100644
--- a/go/test_platform/phosphorus/prejob.pb.go
+++ b/go/test_platform/phosphorus/prejob.pb.go
@@ -7,6 +7,7 @@
fmt "fmt"
proto "github.com/golang/protobuf/proto"
timestamp "github.com/golang/protobuf/ptypes/timestamp"
+ test_platform "go.chromium.org/chromiumos/infra/proto/go/test_platform"
math "math"
)
@@ -67,12 +68,17 @@
// PrejobRequest defines the input of `phosphorus prejob`.
type PrejobRequest struct {
- Config *Config `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"`
- DutHostname string `protobuf:"bytes,2,opt,name=dut_hostname,json=dutHostname,proto3" json:"dut_hostname,omitempty"`
+ Config *Config `protobuf:"bytes,1,opt,name=config,proto3" json:"config,omitempty"`
+ DutHostname string `protobuf:"bytes,2,opt,name=dut_hostname,json=dutHostname,proto3" json:"dut_hostname,omitempty"`
+ // TODO(crbug.com/1162347): Delete this post-migration.
ProvisionableLabels map[string]string `protobuf:"bytes,3,rep,name=provisionable_labels,json=provisionableLabels,proto3" json:"provisionable_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Deprecated: Do not use.
// What needs to be installed onto the DUT at the end of prejob, e.g.
// "cros-version": "reef-release/R77-12345.0.0".
- DesiredProvisionableLabels map[string]string `protobuf:"bytes,4,rep,name=desired_provisionable_labels,json=desiredProvisionableLabels,proto3" json:"desired_provisionable_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+ // TODO(crbug.com/1162347): Delete this post-migration.
+ DesiredProvisionableLabels map[string]string `protobuf:"bytes,4,rep,name=desired_provisionable_labels,json=desiredProvisionableLabels,proto3" json:"desired_provisionable_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Deprecated: Do not use.
+ // What needs to be installed onto the DUT at the end of prejob, as specified
+ // in the cros_test_platform request.
+ SoftwareDependencies []*test_platform.Request_Params_SoftwareDependency `protobuf:"bytes,8,rep,name=software_dependencies,json=softwareDependencies,proto3" json:"software_dependencies,omitempty"`
// What is installed on the DUT before the prejob, e.g.
// "cros-version": "reef-release/R77-12345.0.0".
ExistingProvisionableLabels map[string]string `protobuf:"bytes,5,rep,name=existing_provisionable_labels,json=existingProvisionableLabels,proto3" json:"existing_provisionable_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
@@ -139,6 +145,7 @@
return nil
}
+// Deprecated: Do not use.
func (m *PrejobRequest) GetDesiredProvisionableLabels() map[string]string {
if m != nil {
return m.DesiredProvisionableLabels
@@ -146,6 +153,13 @@
return nil
}
+func (m *PrejobRequest) GetSoftwareDependencies() []*test_platform.Request_Params_SoftwareDependency {
+ if m != nil {
+ return m.SoftwareDependencies
+ }
+ return nil
+}
+
func (m *PrejobRequest) GetExistingProvisionableLabels() map[string]string {
if m != nil {
return m.ExistingProvisionableLabels
@@ -224,39 +238,42 @@
}
var fileDescriptor_5d406d24cdb4ff2a = []byte{
- // 536 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xdf, 0x6e, 0xd3, 0x30,
- 0x14, 0xc6, 0x49, 0xbb, 0xa6, 0xeb, 0x29, 0x9b, 0x82, 0x19, 0x22, 0x0a, 0xa0, 0x85, 0x4a, 0x48,
- 0xbd, 0x72, 0xa4, 0x22, 0xa1, 0x89, 0x2b, 0xda, 0xc6, 0x65, 0x95, 0xf6, 0xa7, 0x4a, 0xd3, 0x1b,
- 0x6e, 0xa2, 0xb4, 0x71, 0xd3, 0x40, 0x12, 0x87, 0xd8, 0x19, 0xec, 0x11, 0x90, 0x78, 0x15, 0xee,
- 0x79, 0x3c, 0x54, 0xa7, 0x05, 0xa6, 0x2d, 0xea, 0x76, 0x97, 0x13, 0x7f, 0xe7, 0x3b, 0x3f, 0xf9,
- 0x7c, 0x32, 0xbc, 0x11, 0x94, 0x0b, 0x2f, 0x8b, 0x7d, 0xb1, 0x64, 0x79, 0x62, 0x65, 0x2b, 0xc6,
- 0xb3, 0x15, 0xcb, 0x0b, 0x6e, 0x65, 0x39, 0xfd, 0xcc, 0xe6, 0x38, 0xcb, 0x99, 0x60, 0x48, 0xbf,
- 0x21, 0xc3, 0xff, 0x64, 0xc6, 0x71, 0xc8, 0x58, 0x18, 0x53, 0x4b, 0xea, 0xe6, 0xc5, 0xd2, 0x12,
- 0x51, 0x42, 0xb9, 0xf0, 0x93, 0xac, 0x6c, 0x35, 0xaa, 0x27, 0x2c, 0x58, 0x92, 0xb0, 0xb4, 0x94,
- 0x75, 0x7e, 0xab, 0x70, 0x30, 0x91, 0x23, 0x1d, 0xfa, 0xb5, 0xa0, 0x5c, 0xa0, 0x13, 0x50, 0x17,
- 0x2c, 0x5d, 0x46, 0xa1, 0xae, 0x98, 0x4a, 0xb7, 0xdd, 0x33, 0x71, 0x15, 0x04, 0x1e, 0x4a, 0x9d,
- 0xb3, 0xd1, 0xa3, 0xd7, 0xf0, 0x38, 0x28, 0x84, 0xb7, 0x62, 0x5c, 0xa4, 0x7e, 0x42, 0xf5, 0x9a,
- 0xa9, 0x74, 0x5b, 0x4e, 0x3b, 0x28, 0xc4, 0xe9, 0xe6, 0x17, 0xfa, 0x06, 0x47, 0x59, 0xce, 0xae,
- 0x22, 0x1e, 0xb1, 0xd4, 0x9f, 0xc7, 0xd4, 0x8b, 0xfd, 0x39, 0x8d, 0xb9, 0x5e, 0x37, 0xeb, 0xdd,
- 0x76, 0xef, 0x43, 0xf5, 0xa8, 0x1b, 0x8c, 0x78, 0xf2, 0xbf, 0xc7, 0x99, 0xb4, 0x20, 0xa9, 0xc8,
- 0xaf, 0x07, 0x35, 0x5d, 0x71, 0x9e, 0x66, 0xb7, 0x4f, 0xd1, 0x0f, 0x05, 0x5e, 0x06, 0x94, 0x47,
- 0x39, 0x0d, 0xbc, 0x3b, 0x09, 0xf6, 0x24, 0xc1, 0xc7, 0xfb, 0x12, 0xd8, 0xa5, 0x57, 0x15, 0x88,
- 0x63, 0x04, 0x95, 0x02, 0xf4, 0x53, 0x81, 0x57, 0xf4, 0x7b, 0xc4, 0x45, 0x94, 0x86, 0x77, 0xc3,
- 0x34, 0x24, 0xcc, 0xe9, 0x7d, 0x61, 0xc8, 0xc6, 0xac, 0x92, 0xe6, 0x05, 0xad, 0x56, 0xa0, 0x77,
- 0xb0, 0x1f, 0x50, 0x3f, 0x88, 0xa3, 0x94, 0xea, 0xaa, 0x5c, 0xb9, 0x81, 0xcb, 0x74, 0xe1, 0x6d,
- 0xba, 0xb0, 0xbb, 0x4d, 0x97, 0xf3, 0x57, 0x8b, 0x9e, 0x43, 0xb3, 0xe0, 0xd4, 0x13, 0x31, 0xd7,
- 0x9b, 0xa6, 0xd2, 0xdd, 0x77, 0xd4, 0x82, 0x53, 0x37, 0xe6, 0xc6, 0x08, 0xf4, 0x2a, 0x12, 0xa4,
- 0x41, 0xfd, 0x0b, 0xbd, 0x96, 0xd1, 0x6a, 0x39, 0xeb, 0x4f, 0x74, 0x04, 0x8d, 0x2b, 0x3f, 0x2e,
- 0xb6, 0x71, 0x29, 0x8b, 0xf7, 0xb5, 0x13, 0xc5, 0x38, 0x87, 0xe3, 0x1d, 0xd7, 0xfc, 0x20, 0xbb,
- 0x0b, 0x30, 0x77, 0x5d, 0xd4, 0x43, 0xfc, 0x3a, 0xbf, 0x14, 0x38, 0xdc, 0xee, 0x81, 0x67, 0x2c,
- 0xe5, 0x14, 0xd9, 0xd0, 0xe0, 0xc2, 0x17, 0x54, 0x1a, 0x1c, 0xf6, 0xf0, 0xee, 0x05, 0x96, 0x8d,
- 0x78, 0xba, 0xee, 0x72, 0xca, 0xe6, 0xce, 0x0c, 0x1a, 0xb2, 0x46, 0xcf, 0xe0, 0xc9, 0xd4, 0xed,
- 0xbb, 0xc4, 0x9b, 0x5d, 0x4c, 0x27, 0x64, 0x38, 0x1e, 0x8d, 0x89, 0xad, 0x3d, 0x42, 0x07, 0xd0,
- 0x9a, 0xce, 0x86, 0x43, 0x42, 0x6c, 0x62, 0x6b, 0x0a, 0x02, 0x50, 0x47, 0xfd, 0xf1, 0x19, 0xb1,
- 0xb5, 0xda, 0xfa, 0xc8, 0x1d, 0x9f, 0x13, 0xdb, 0xbb, 0x9c, 0xb9, 0x5a, 0x1d, 0xb5, 0xa1, 0xd9,
- 0x1f, 0x5c, 0x3a, 0x2e, 0xb1, 0xb5, 0xbd, 0x81, 0xfd, 0x69, 0x10, 0x32, 0xbc, 0x58, 0xe5, 0x2c,
- 0x89, 0x8a, 0x04, 0xb3, 0x3c, 0xb4, 0xb6, 0x05, 0xe3, 0x56, 0x94, 0x2e, 0x73, 0xbf, 0x7c, 0x4e,
- 0xac, 0x90, 0x59, 0x55, 0xaf, 0xc7, 0x5c, 0x95, 0x92, 0xb7, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff,
- 0xaa, 0x4a, 0x57, 0xa4, 0xc2, 0x04, 0x00, 0x00,
+ // 588 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x5f, 0x6f, 0xd3, 0x3e,
+ 0x14, 0xfd, 0xa5, 0x5d, 0xdb, 0xcd, 0xfd, 0x6d, 0x2a, 0x66, 0x13, 0x51, 0x07, 0x5a, 0x98, 0x84,
+ 0xd4, 0x27, 0x07, 0x0d, 0x09, 0x4d, 0x3c, 0xb1, 0x36, 0x19, 0xab, 0xb4, 0x7f, 0x4a, 0xd3, 0x17,
+ 0x5e, 0x22, 0xb7, 0xb9, 0x4d, 0x0d, 0x49, 0x1c, 0x6c, 0x67, 0x63, 0xdf, 0x01, 0x3e, 0x05, 0xcf,
+ 0x7c, 0x47, 0x34, 0xa7, 0x19, 0x6c, 0x2c, 0x74, 0x7b, 0x8b, 0x7d, 0xcf, 0x39, 0xf7, 0xdc, 0xdc,
+ 0x23, 0xa3, 0x57, 0x0a, 0xa4, 0x0a, 0xb2, 0x98, 0xaa, 0x19, 0x17, 0x89, 0x9d, 0xcd, 0xb9, 0xcc,
+ 0xe6, 0x5c, 0xe4, 0xd2, 0xce, 0x04, 0x7c, 0xe2, 0x13, 0x92, 0x09, 0xae, 0x38, 0x36, 0x6f, 0xc1,
+ 0xc8, 0x6f, 0x58, 0x77, 0x27, 0xe2, 0x3c, 0x8a, 0xc1, 0xd6, 0xb8, 0x49, 0x3e, 0xb3, 0x15, 0x4b,
+ 0x40, 0x2a, 0x9a, 0x64, 0x05, 0xb5, 0x5b, 0xdd, 0x61, 0xca, 0x93, 0x84, 0xa7, 0x0b, 0xd8, 0xf6,
+ 0x6d, 0x98, 0x80, 0x2f, 0x39, 0x48, 0x55, 0x14, 0x77, 0x7f, 0xb4, 0xd0, 0xfa, 0xb9, 0xf6, 0xe3,
+ 0x15, 0xf7, 0x78, 0x1f, 0x35, 0xa7, 0x3c, 0x9d, 0xb1, 0xc8, 0x34, 0x2c, 0xa3, 0xd7, 0xde, 0xb3,
+ 0x48, 0x95, 0x43, 0x32, 0xd0, 0x38, 0x6f, 0x81, 0xc7, 0x2f, 0xd1, 0xff, 0x61, 0xae, 0x82, 0x39,
+ 0x97, 0x2a, 0xa5, 0x09, 0x98, 0x35, 0xcb, 0xe8, 0xad, 0x79, 0xed, 0x30, 0x57, 0x47, 0x8b, 0x2b,
+ 0x7c, 0x89, 0x36, 0x33, 0xc1, 0x2f, 0x98, 0x64, 0x3c, 0xa5, 0x93, 0x18, 0x82, 0x98, 0x4e, 0x20,
+ 0x96, 0x66, 0xdd, 0xaa, 0xf7, 0xda, 0x7b, 0xef, 0xab, 0x5b, 0xdd, 0xf2, 0x48, 0xce, 0xff, 0xd4,
+ 0x38, 0xd6, 0x12, 0x6e, 0xaa, 0xc4, 0x55, 0xbf, 0x66, 0x1a, 0xde, 0xd3, 0xec, 0xef, 0x2a, 0xfe,
+ 0x6e, 0xa0, 0xe7, 0x21, 0x48, 0x26, 0x20, 0x0c, 0xee, 0x75, 0xb0, 0xa2, 0x1d, 0x7c, 0x78, 0xa8,
+ 0x03, 0xa7, 0xd0, 0xfa, 0xa7, 0x91, 0x6e, 0x58, 0x09, 0xc2, 0x80, 0xb6, 0x24, 0x9f, 0xa9, 0x4b,
+ 0x2a, 0x20, 0x08, 0x21, 0x83, 0x34, 0x84, 0x74, 0xca, 0x40, 0x9a, 0xab, 0xda, 0xc7, 0xeb, 0x3b,
+ 0x3e, 0x6e, 0x06, 0xa7, 0x82, 0x26, 0x92, 0x8c, 0x16, 0x54, 0xa7, 0x64, 0x5e, 0x79, 0x9b, 0xf2,
+ 0xee, 0x1d, 0x03, 0x89, 0xbf, 0x19, 0xe8, 0x05, 0x7c, 0x65, 0x52, 0xb1, 0x34, 0xba, 0x7f, 0xee,
+ 0x86, 0xee, 0x77, 0xf4, 0xd0, 0xb9, 0xdd, 0x85, 0x58, 0xd5, 0xe0, 0xde, 0x36, 0x54, 0x23, 0xf0,
+ 0x5b, 0xb4, 0x1a, 0x02, 0x0d, 0x63, 0x96, 0x82, 0xd9, 0xd4, 0xe9, 0xea, 0x92, 0x22, 0xe5, 0xa4,
+ 0x4c, 0x39, 0xf1, 0xcb, 0x94, 0x7b, 0x37, 0x58, 0xfc, 0x0c, 0xb5, 0x72, 0x09, 0x81, 0x8a, 0xa5,
+ 0xd9, 0xb2, 0x8c, 0xde, 0xaa, 0xd7, 0xcc, 0x25, 0xf8, 0xb1, 0xec, 0x1e, 0x22, 0xb3, 0xca, 0x09,
+ 0xee, 0xa0, 0xfa, 0x67, 0xb8, 0xd2, 0x29, 0x5e, 0xf3, 0xae, 0x3f, 0xf1, 0x26, 0x6a, 0x5c, 0xd0,
+ 0x38, 0x2f, 0x93, 0x59, 0x1c, 0xde, 0xd5, 0xf6, 0x8d, 0xee, 0x09, 0xda, 0x59, 0xb2, 0xd1, 0x47,
+ 0xc9, 0x9d, 0x22, 0x6b, 0xd9, 0x8f, 0x7a, 0x8c, 0xde, 0xee, 0x4f, 0x03, 0x6d, 0x94, 0x7b, 0x90,
+ 0x19, 0x4f, 0x25, 0x60, 0x07, 0x35, 0xa4, 0xa2, 0x0a, 0xb4, 0xc0, 0xc6, 0x1e, 0x59, 0xbe, 0xc0,
+ 0x82, 0x48, 0x46, 0xd7, 0x2c, 0xaf, 0x20, 0xef, 0x8e, 0x51, 0x43, 0x9f, 0xf1, 0x16, 0x7a, 0x32,
+ 0xf2, 0x0f, 0x7c, 0x37, 0x18, 0x9f, 0x8e, 0xce, 0xdd, 0xc1, 0xf0, 0x70, 0xe8, 0x3a, 0x9d, 0xff,
+ 0xf0, 0x3a, 0x5a, 0x1b, 0x8d, 0x07, 0x03, 0xd7, 0x75, 0x5c, 0xa7, 0x63, 0x60, 0x84, 0x9a, 0x87,
+ 0x07, 0xc3, 0x63, 0xd7, 0xe9, 0xd4, 0xae, 0x4b, 0xfe, 0xf0, 0xc4, 0x75, 0x82, 0xb3, 0xb1, 0xdf,
+ 0xa9, 0xe3, 0x36, 0x6a, 0x1d, 0xf4, 0xcf, 0x3c, 0xdf, 0x75, 0x3a, 0x2b, 0x7d, 0xe7, 0x63, 0x3f,
+ 0xe2, 0x64, 0x3a, 0x17, 0x3c, 0x61, 0x79, 0x42, 0xb8, 0x88, 0xec, 0xf2, 0xc0, 0xa5, 0xcd, 0xd2,
+ 0x99, 0xa0, 0xc5, 0xb3, 0x66, 0x47, 0xdc, 0xae, 0x7a, 0xc5, 0x26, 0x4d, 0x0d, 0x79, 0xf3, 0x2b,
+ 0x00, 0x00, 0xff, 0xff, 0xa7, 0x80, 0xb4, 0x95, 0x4a, 0x05, 0x00, 0x00,
}
diff --git a/go/test_platform/skylab_test_runner/request.pb.go b/go/test_platform/skylab_test_runner/request.pb.go
index 173d823..95d6414 100644
--- a/go/test_platform/skylab_test_runner/request.pb.go
+++ b/go/test_platform/skylab_test_runner/request.pb.go
@@ -127,10 +127,13 @@
// Prejob defines parameters that affect the steps before the actual test
// (e.g. provision).
type Request_Prejob struct {
- SoftwareDependencies []*test_platform.Request_Params_SoftwareDependency `protobuf:"bytes,1,rep,name=software_dependencies,json=softwareDependencies,proto3" json:"software_dependencies,omitempty"` // Deprecated: Do not use.
+ // What needs to be installed onto the DUT at the end of prejob, as specified
+ // in the cros_test_platform request.
+ SoftwareDependencies []*test_platform.Request_Params_SoftwareDependency `protobuf:"bytes,1,rep,name=software_dependencies,json=softwareDependencies,proto3" json:"software_dependencies,omitempty"`
// Mutable software prerequisites. Are installed before running the test if
// necessary. E.g. {"cros-version" : "reef-release/R77-12345.0.0"}
- ProvisionableLabels map[string]string `protobuf:"bytes,2,rep,name=provisionable_labels,json=provisionableLabels,proto3" json:"provisionable_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+ // TODO(crbug.com/1162347): Delete this post-migration.
+ ProvisionableLabels map[string]string `protobuf:"bytes,2,rep,name=provisionable_labels,json=provisionableLabels,proto3" json:"provisionable_labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Deprecated: Do not use.
// If set, use the Provision TLS API for the prejob.
// See go/cros-prover go/cros-tls
//
@@ -168,7 +171,6 @@
var xxx_messageInfo_Request_Prejob proto.InternalMessageInfo
-// Deprecated: Do not use.
func (m *Request_Prejob) GetSoftwareDependencies() []*test_platform.Request_Params_SoftwareDependency {
if m != nil {
return m.SoftwareDependencies
@@ -176,6 +178,7 @@
return nil
}
+// Deprecated: Do not use.
func (m *Request_Prejob) GetProvisionableLabels() map[string]string {
if m != nil {
return m.ProvisionableLabels
@@ -403,51 +406,51 @@
}
var fileDescriptor_0203b6078e3ef1f3 = []byte{
- // 725 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x5d, 0x6f, 0xd3, 0x48,
- 0x14, 0xdd, 0x7c, 0x27, 0x37, 0xdd, 0xb6, 0x9a, 0xb6, 0x5a, 0xcb, 0x95, 0x76, 0xb3, 0xbb, 0x08,
- 0xe5, 0x01, 0x8d, 0x51, 0x41, 0x80, 0x2a, 0xf1, 0xd0, 0x90, 0xd2, 0x0f, 0x2a, 0x5a, 0x0d, 0xad,
- 0x90, 0x78, 0xc0, 0x9a, 0xc4, 0x13, 0x77, 0xa8, 0xed, 0x31, 0x73, 0xed, 0x42, 0x24, 0x7e, 0x0c,
- 0x4f, 0x3c, 0xf0, 0x73, 0xf8, 0x45, 0xc8, 0x63, 0x27, 0x4d, 0x5a, 0x50, 0x09, 0x6f, 0x99, 0x3b,
- 0xe7, 0x9e, 0x7b, 0xee, 0x3d, 0x77, 0x62, 0xa0, 0x89, 0xc0, 0xc4, 0x8d, 0x03, 0x9e, 0x8c, 0x94,
- 0x0e, 0x1d, 0xbc, 0x18, 0x07, 0x7c, 0xe0, 0x9a, 0xa0, 0x4e, 0xa3, 0x48, 0x68, 0x47, 0x8b, 0xf7,
- 0xa9, 0xc0, 0x84, 0xc6, 0x5a, 0x25, 0x8a, 0x74, 0xe6, 0xf0, 0xf4, 0x26, 0xde, 0xfe, 0xc7, 0x57,
- 0xca, 0x0f, 0x84, 0x63, 0xf0, 0x83, 0x74, 0xe4, 0x24, 0x32, 0x14, 0x98, 0xf0, 0x30, 0xce, 0x29,
- 0xec, 0xff, 0xe7, 0x4b, 0x8a, 0x8f, 0x62, 0x98, 0x26, 0x52, 0x45, 0x4e, 0xcc, 0x35, 0x0f, 0x0b,
- 0xd0, 0xe6, 0x3c, 0x68, 0x4e, 0xc4, 0x7f, 0x5f, 0xda, 0xd0, 0x60, 0x79, 0x84, 0xec, 0x43, 0x3d,
- 0xd6, 0xe2, 0x9d, 0x1a, 0x58, 0xa5, 0x4e, 0xa9, 0xdb, 0xde, 0xba, 0x4f, 0x6f, 0x53, 0x48, 0x8b,
- 0x54, 0x7a, 0x62, 0xf2, 0x58, 0x91, 0x4f, 0x7a, 0x50, 0xcd, 0x50, 0x56, 0xd9, 0xf0, 0xd0, 0x5f,
- 0xe7, 0x39, 0x15, 0x98, 0x30, 0x93, 0x4b, 0x1e, 0x41, 0xd3, 0x13, 0xdc, 0x0b, 0x64, 0x24, 0xac,
- 0x8a, 0xe1, 0xb1, 0x69, 0x3e, 0x0f, 0x3a, 0x99, 0x07, 0x3d, 0x9d, 0xcc, 0x83, 0x4d, 0xb1, 0xe4,
- 0x1e, 0x90, 0x98, 0x6b, 0x11, 0x25, 0x6e, 0xd1, 0xa9, 0x9b, 0x4a, 0xcf, 0xaa, 0x76, 0x4a, 0xdd,
- 0x16, 0x5b, 0xcd, 0x6f, 0x8a, 0x6a, 0x67, 0xd2, 0x23, 0x77, 0x61, 0xa5, 0x40, 0x0f, 0x52, 0x19,
- 0x78, 0xae, 0xf4, 0xac, 0x5a, 0xa7, 0xd4, 0xad, 0xb0, 0x3f, 0xf3, 0x70, 0x2f, 0x8b, 0x1e, 0x78,
- 0xe4, 0x10, 0x6a, 0x99, 0x2a, 0xb4, 0xea, 0x9d, 0x4a, 0xb7, 0xbd, 0xf5, 0x70, 0xb1, 0x96, 0x70,
- 0x37, 0x4a, 0xf4, 0x98, 0xe5, 0x14, 0x64, 0x0f, 0x56, 0xa6, 0x4e, 0xb9, 0xc6, 0x29, 0xab, 0x61,
- 0x1a, 0xfc, 0xfb, 0x1a, 0xeb, 0x14, 0x45, 0x4f, 0x32, 0x14, 0x5b, 0x9e, 0x06, 0xcc, 0xd9, 0xfe,
- 0x56, 0x86, 0x7a, 0x3e, 0x79, 0x22, 0x61, 0x03, 0xd5, 0x28, 0xf9, 0xc0, 0xb5, 0x70, 0x3d, 0x11,
- 0x8b, 0xc8, 0x13, 0xd1, 0x50, 0x0a, 0xb4, 0x4a, 0x46, 0xef, 0x75, 0x2b, 0xa7, 0xbe, 0x65, 0x3c,
- 0x48, 0x5f, 0x15, 0xa9, 0xfd, 0x49, 0xe6, 0xb8, 0x57, 0xb6, 0x4a, 0x6c, 0x1d, 0xaf, 0xc7, 0xa5,
- 0x40, 0xf2, 0x09, 0xd6, 0x63, 0xad, 0x2e, 0x25, 0x4a, 0x15, 0xf1, 0x41, 0x20, 0xdc, 0x80, 0x0f,
- 0x44, 0x80, 0x56, 0xd9, 0x54, 0x3a, 0x58, 0x74, 0x69, 0xe8, 0xc9, 0x2c, 0xd9, 0x91, 0xe1, 0xca,
- 0xc7, 0xb5, 0x16, 0xdf, 0xbc, 0x21, 0x7f, 0x41, 0x23, 0x45, 0xe1, 0x26, 0x01, 0x9a, 0xad, 0x68,
- 0xb2, 0x7a, 0x8a, 0xe2, 0x34, 0x40, 0xfb, 0x39, 0x58, 0x3f, 0x63, 0x22, 0xab, 0x50, 0xb9, 0x10,
- 0x63, 0xb3, 0xd6, 0x2d, 0x96, 0xfd, 0x24, 0xeb, 0x50, 0xbb, 0xe4, 0x41, 0x2a, 0xcc, 0x8a, 0xb6,
- 0x58, 0x7e, 0xd8, 0x2e, 0x3f, 0x29, 0xd9, 0x5f, 0xab, 0x50, 0xcd, 0x3c, 0x23, 0x67, 0xd0, 0xe4,
- 0x69, 0xa2, 0xcc, 0x22, 0xe7, 0x0f, 0xe2, 0xf1, 0x62, 0xae, 0xd3, 0x9d, 0x22, 0x7d, 0xff, 0x0f,
- 0x36, 0xa5, 0x22, 0xaf, 0xa1, 0xa1, 0x46, 0xa3, 0x40, 0x71, 0xaf, 0x78, 0x1e, 0x4f, 0x17, 0x64,
- 0x3d, 0xce, 0xb3, 0x8f, 0xe3, 0x6c, 0x11, 0x90, 0x4d, 0xd8, 0xec, 0xcf, 0x65, 0x68, 0x4e, 0x2a,
- 0x12, 0x02, 0xd5, 0x88, 0x87, 0xa2, 0x68, 0xd9, 0xfc, 0x26, 0x9b, 0xd0, 0x32, 0xa4, 0x5c, 0xfb,
- 0x58, 0xf4, 0xdd, 0xcc, 0x02, 0x3b, 0xda, 0x47, 0xf2, 0x16, 0x1a, 0x17, 0x62, 0x7c, 0xc9, 0xcd,
- 0x5c, 0x33, 0x23, 0xfb, 0xbf, 0xd9, 0x2c, 0x7d, 0x91, 0xd3, 0xe4, 0x1e, 0x4e, 0x48, 0xc9, 0x1d,
- 0x58, 0x96, 0xe8, 0x0e, 0x03, 0x99, 0xbd, 0x35, 0x33, 0xd3, 0xaa, 0xb1, 0x6f, 0x49, 0xe2, 0x33,
- 0x13, 0x34, 0x33, 0xff, 0x17, 0x96, 0x3c, 0x89, 0x71, 0xc0, 0xc7, 0xae, 0x91, 0x5f, 0x33, 0x2a,
- 0xdb, 0x45, 0xec, 0x25, 0x0f, 0x85, 0xbd, 0x0d, 0x4b, 0xb3, 0x15, 0x16, 0xf2, 0xb6, 0x0f, 0xcb,
- 0xf3, 0xd3, 0x23, 0x5b, 0xb0, 0x81, 0xe3, 0x68, 0x78, 0xae, 0x55, 0xa4, 0x52, 0x74, 0x7d, 0x74,
- 0x85, 0xd9, 0x1e, 0xc3, 0xd7, 0x64, 0x6b, 0x33, 0x97, 0x7b, 0xb8, 0x6b, 0xae, 0x7a, 0x2d, 0x68,
- 0x9c, 0x73, 0x1d, 0x09, 0x44, 0xfb, 0x1c, 0xe0, 0xea, 0x7d, 0xff, 0x40, 0x4a, 0x7f, 0x56, 0xca,
- 0xe2, 0xff, 0x84, 0x57, 0xd2, 0x7b, 0x47, 0x6f, 0x0e, 0x7d, 0x45, 0x33, 0x2d, 0xa1, 0x4c, 0x43,
- 0xaa, 0xb4, 0xef, 0x4c, 0x0e, 0x0a, 0x1d, 0x19, 0x8d, 0x34, 0xcf, 0xbf, 0x13, 0x8e, 0xaf, 0x9c,
- 0xdb, 0xbe, 0x44, 0x83, 0xba, 0x81, 0x3e, 0xf8, 0x1e, 0x00, 0x00, 0xff, 0xff, 0xae, 0x5b, 0x0b,
- 0x27, 0xb4, 0x06, 0x00, 0x00,
+ // 728 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x4d, 0x6f, 0xdb, 0x46,
+ 0x10, 0x2d, 0xf5, 0xad, 0x95, 0x6b, 0x1b, 0x6b, 0x1b, 0x25, 0x68, 0xa0, 0x55, 0x3f, 0x50, 0xe8,
+ 0x50, 0x2c, 0x0b, 0xb7, 0x68, 0x03, 0x03, 0x39, 0x58, 0x91, 0xe3, 0x8f, 0x18, 0xb1, 0xb1, 0xb1,
+ 0x11, 0x20, 0x87, 0x10, 0x2b, 0x71, 0x44, 0x6f, 0x4c, 0x72, 0x99, 0x1d, 0xd2, 0x89, 0x6e, 0xf9,
+ 0x29, 0xb9, 0x05, 0xc8, 0xdf, 0xc9, 0x1f, 0x0a, 0xb8, 0xa4, 0x64, 0xc9, 0x4e, 0xe0, 0x28, 0x37,
+ 0xed, 0xec, 0x9b, 0x37, 0x6f, 0xe6, 0xcd, 0x8a, 0x84, 0xa5, 0x80, 0xa9, 0x97, 0x84, 0x22, 0x1d,
+ 0x2b, 0x1d, 0xb9, 0x78, 0x35, 0x09, 0xc5, 0xd0, 0x33, 0x41, 0x9d, 0xc5, 0x31, 0x68, 0x57, 0xc3,
+ 0xeb, 0x0c, 0x30, 0x65, 0x89, 0x56, 0xa9, 0xa2, 0xdd, 0x05, 0x3c, 0xbb, 0x8b, 0x77, 0x7e, 0x09,
+ 0x94, 0x0a, 0x42, 0x70, 0x0d, 0x7e, 0x98, 0x8d, 0xdd, 0x54, 0x46, 0x80, 0xa9, 0x88, 0x92, 0x82,
+ 0xc2, 0xf9, 0x7d, 0xb1, 0x24, 0xbc, 0x85, 0x51, 0x96, 0x4a, 0x15, 0xbb, 0x89, 0xd0, 0x22, 0x2a,
+ 0x41, 0xdb, 0x8b, 0xa0, 0x05, 0x11, 0xbf, 0x7d, 0xe8, 0x90, 0x26, 0x2f, 0x22, 0xf4, 0x90, 0x34,
+ 0x12, 0x0d, 0xaf, 0xd4, 0xd0, 0xb6, 0xba, 0x56, 0xaf, 0xb3, 0xf3, 0x37, 0xbb, 0x4f, 0x21, 0x2b,
+ 0x53, 0xd9, 0x99, 0xc9, 0xe3, 0x65, 0x3e, 0xed, 0x93, 0x5a, 0x8e, 0xb2, 0x2b, 0x86, 0x87, 0x7d,
+ 0x3b, 0xcf, 0x39, 0x60, 0xca, 0x4d, 0x2e, 0xfd, 0x8f, 0xb4, 0x7c, 0x10, 0x7e, 0x28, 0x63, 0xb0,
+ 0xab, 0x86, 0xc7, 0x61, 0xc5, 0x3c, 0xd8, 0x74, 0x1e, 0xec, 0x7c, 0x3a, 0x0f, 0x3e, 0xc3, 0xd2,
+ 0xbf, 0x08, 0x4d, 0x84, 0x86, 0x38, 0xf5, 0xca, 0x4e, 0xbd, 0x4c, 0xfa, 0x76, 0xad, 0x6b, 0xf5,
+ 0xda, 0x7c, 0xbd, 0xb8, 0x29, 0xab, 0x5d, 0x48, 0x9f, 0xfe, 0x49, 0xd6, 0x4a, 0xf4, 0x30, 0x93,
+ 0xa1, 0xef, 0x49, 0xdf, 0xae, 0x77, 0xad, 0x5e, 0x95, 0xff, 0x58, 0x84, 0xfb, 0x79, 0xf4, 0xc8,
+ 0xa7, 0xc7, 0xa4, 0x9e, 0xab, 0x42, 0xbb, 0xd1, 0xad, 0xf6, 0x3a, 0x3b, 0xff, 0x2e, 0xd7, 0x12,
+ 0xee, 0xc7, 0xa9, 0x9e, 0xf0, 0x82, 0x82, 0x1e, 0x90, 0xb5, 0x99, 0x53, 0x9e, 0x71, 0xca, 0x6e,
+ 0x9a, 0x06, 0x7f, 0xbe, 0xc5, 0x3a, 0x43, 0xb1, 0xb3, 0x1c, 0xc5, 0x57, 0x67, 0x01, 0x73, 0x76,
+ 0x3e, 0x55, 0x48, 0xa3, 0x98, 0x3c, 0x05, 0xb2, 0x85, 0x6a, 0x9c, 0xbe, 0x11, 0x1a, 0x3c, 0x1f,
+ 0x12, 0x88, 0x7d, 0x88, 0x47, 0x12, 0xd0, 0xb6, 0x8c, 0xde, 0xdb, 0x56, 0xce, 0x7c, 0xcb, 0x79,
+ 0x90, 0x3d, 0x2b, 0x53, 0x07, 0xd3, 0xcc, 0x09, 0xdf, 0xc4, 0xdb, 0x31, 0x09, 0x48, 0xdf, 0x59,
+ 0x64, 0x33, 0xd1, 0xea, 0x5a, 0xa2, 0x54, 0xb1, 0x18, 0x86, 0xe0, 0x85, 0x62, 0x08, 0x21, 0xda,
+ 0x15, 0x53, 0xe6, 0x68, 0xd9, 0x8d, 0x61, 0x67, 0xf3, 0x64, 0x27, 0x86, 0xcb, 0xcc, 0xaa, 0x5f,
+ 0xb1, 0x2d, 0xbe, 0x91, 0xdc, 0xbd, 0xa5, 0x3f, 0x91, 0x66, 0x86, 0xe0, 0xa5, 0x21, 0x9a, 0xb5,
+ 0x68, 0xf1, 0x46, 0x86, 0x70, 0x1e, 0xa2, 0xf3, 0x98, 0xd8, 0x5f, 0x63, 0xa3, 0xeb, 0xa4, 0x7a,
+ 0x05, 0x13, 0xb3, 0xd7, 0x6d, 0x9e, 0xff, 0xa4, 0x9b, 0xa4, 0x7e, 0x2d, 0xc2, 0x0c, 0xcc, 0x8e,
+ 0xb6, 0x79, 0x71, 0xd8, 0xad, 0x3c, 0xb0, 0x9c, 0x8f, 0x35, 0x52, 0xcb, 0x4d, 0xa3, 0x17, 0xa4,
+ 0x25, 0xb2, 0x54, 0x99, 0x4d, 0x2e, 0x5e, 0xc4, 0xff, 0xcb, 0xd9, 0xce, 0xf6, 0xca, 0xf4, 0xc3,
+ 0x1f, 0xf8, 0x8c, 0x8a, 0x3e, 0x27, 0x4d, 0x35, 0x1e, 0x87, 0x4a, 0xf8, 0xe5, 0xfb, 0x78, 0xb8,
+ 0x24, 0xeb, 0x69, 0x91, 0x7d, 0x9a, 0xe4, 0x9b, 0x80, 0x7c, 0xca, 0xe6, 0xbc, 0xaf, 0x90, 0xd6,
+ 0xb4, 0x22, 0xa5, 0xa4, 0x16, 0x8b, 0x08, 0xca, 0x96, 0xcd, 0x6f, 0xba, 0x4d, 0xda, 0x86, 0x54,
+ 0xe8, 0x00, 0xcb, 0xbe, 0x5b, 0x79, 0x60, 0x4f, 0x07, 0x48, 0x5f, 0x92, 0xe6, 0x15, 0x4c, 0xae,
+ 0x85, 0x99, 0x6b, 0x6e, 0xe6, 0xe0, 0x3b, 0x9b, 0x65, 0x4f, 0x0a, 0x9a, 0x62, 0xe7, 0xa7, 0xa4,
+ 0xf4, 0x0f, 0xb2, 0x2a, 0xd1, 0x1b, 0x85, 0x32, 0x7f, 0x6c, 0x66, 0xa6, 0x35, 0x63, 0xdf, 0x8a,
+ 0xc4, 0x47, 0x26, 0x68, 0x66, 0xfe, 0x2b, 0x59, 0xf1, 0x25, 0x26, 0xa1, 0x98, 0x78, 0x46, 0x7e,
+ 0xdd, 0xa8, 0xec, 0x94, 0xb1, 0xa7, 0x22, 0x02, 0x67, 0x97, 0xac, 0xcc, 0x57, 0x58, 0xca, 0xdb,
+ 0x01, 0x59, 0x5d, 0x9c, 0x1e, 0xdd, 0x21, 0x5b, 0x38, 0x89, 0x47, 0x97, 0x5a, 0xc5, 0x2a, 0x43,
+ 0x2f, 0x40, 0x0f, 0xcc, 0xf6, 0x18, 0xbe, 0x16, 0xdf, 0x98, 0xbb, 0x3c, 0xc0, 0x7d, 0x73, 0xd5,
+ 0x6f, 0x93, 0xe6, 0xa5, 0xd0, 0x31, 0x20, 0x3a, 0x97, 0x84, 0xdc, 0x3c, 0xf0, 0x2f, 0x48, 0x19,
+ 0xcc, 0x4b, 0x59, 0xfe, 0xaf, 0xf0, 0x46, 0x7a, 0xff, 0xe4, 0xc5, 0x71, 0xa0, 0x58, 0xae, 0x25,
+ 0x92, 0x59, 0xc4, 0x94, 0x0e, 0xdc, 0xe9, 0x41, 0xa1, 0x2b, 0xe3, 0xb1, 0x16, 0xc5, 0x87, 0xc2,
+ 0x0d, 0x94, 0x7b, 0xdf, 0xa7, 0x68, 0xd8, 0x30, 0xd0, 0x7f, 0x3e, 0x07, 0x00, 0x00, 0xff, 0xff,
+ 0xea, 0x7c, 0x95, 0x25, 0xb5, 0x06, 0x00, 0x00,
}
diff --git a/src/test_platform/phosphorus/prejob.proto b/src/test_platform/phosphorus/prejob.proto
index ab28c62..04738b5 100644
--- a/src/test_platform/phosphorus/prejob.proto
+++ b/src/test_platform/phosphorus/prejob.proto
@@ -10,6 +10,7 @@
import "google/protobuf/timestamp.proto";
import "test_platform/phosphorus/common.proto";
+import "test_platform/request.proto";
// PrejobRequest defines the input of `phosphorus prejob`.
message PrejobRequest {
@@ -17,11 +18,17 @@
string dut_hostname = 2;
+ // TODO(crbug.com/1162347): Delete this post-migration.
map<string,string> provisionable_labels = 3 [deprecated = true];
// What needs to be installed onto the DUT at the end of prejob, e.g.
// "cros-version": "reef-release/R77-12345.0.0".
- map<string,string> desired_provisionable_labels = 4;
+ // TODO(crbug.com/1162347): Delete this post-migration.
+ map<string,string> desired_provisionable_labels = 4 [deprecated = true];
+
+ // What needs to be installed onto the DUT at the end of prejob, as specified
+ // in the cros_test_platform request.
+ repeated test_platform.Request.Params.SoftwareDependency software_dependencies = 8;
// What is installed on the DUT before the prejob, e.g.
// "cros-version": "reef-release/R77-12345.0.0".
diff --git a/src/test_platform/skylab_test_runner/request.proto b/src/test_platform/skylab_test_runner/request.proto
index 0d79a1e..71ce051 100644
--- a/src/test_platform/skylab_test_runner/request.proto
+++ b/src/test_platform/skylab_test_runner/request.proto
@@ -18,11 +18,14 @@
// Prejob defines parameters that affect the steps before the actual test
// (e.g. provision).
message Prejob {
- repeated test_platform.Request.Params.SoftwareDependency software_dependencies = 1 [deprecated = true];
+ // What needs to be installed onto the DUT at the end of prejob, as specified
+ // in the cros_test_platform request.
+ repeated test_platform.Request.Params.SoftwareDependency software_dependencies = 1;
// Mutable software prerequisites. Are installed before running the test if
// necessary. E.g. {"cros-version" : "reef-release/R77-12345.0.0"}
- map<string, string> provisionable_labels = 2;
+ // TODO(crbug.com/1162347): Delete this post-migration.
+ map<string, string> provisionable_labels = 2 [deprecated = true];
// If set, use the Provision TLS API for the prejob.
// See go/cros-prover go/cros-tls
