testplans: remove unused Moblab and (nondirect) Tast VM fields
Part of my broader work on oneof testing, in the collateral cleanups I'm
making while I'm in the neighborhood.
Bug: 1130018
Change-Id: I99cdf52ccafebccf58a81b040d5f79c50b63bc4e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/proto/+/2422668
Auto-Submit: Sean Abraham <seanabraham@chromium.org>
Reviewed-by: Dhanya Ganesh <dhanyaganesh@chromium.org>
Commit-Queue: Dhanya Ganesh <dhanyaganesh@chromium.org>
diff --git a/go/testplans/generate_test_plan.pb.go b/go/testplans/generate_test_plan.pb.go
index 43764a9..cc64613 100644
--- a/go/testplans/generate_test_plan.pb.go
+++ b/go/testplans/generate_test_plan.pb.go
@@ -97,14 +97,12 @@
// The final test plan.
type GenerateTestPlanResponse struct {
- HwTestUnits []*HwTestUnit `protobuf:"bytes,3,rep,name=hw_test_units,json=hwTestUnits,proto3" json:"hw_test_units,omitempty"`
- MoblabVmTestUnits []*MoblabVmTestUnit `protobuf:"bytes,4,rep,name=moblab_vm_test_units,json=moblabVmTestUnits,proto3" json:"moblab_vm_test_units,omitempty"`
- TastVmTestUnits []*TastVmTestUnit `protobuf:"bytes,5,rep,name=tast_vm_test_units,json=tastVmTestUnits,proto3" json:"tast_vm_test_units,omitempty"`
- VmTestUnits []*VmTestUnit `protobuf:"bytes,6,rep,name=vm_test_units,json=vmTestUnits,proto3" json:"vm_test_units,omitempty"`
- DirectTastVmTestUnits []*TastVmTestUnit `protobuf:"bytes,7,rep,name=direct_tast_vm_test_units,json=directTastVmTestUnits,proto3" json:"direct_tast_vm_test_units,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
+ HwTestUnits []*HwTestUnit `protobuf:"bytes,3,rep,name=hw_test_units,json=hwTestUnits,proto3" json:"hw_test_units,omitempty"`
+ VmTestUnits []*VmTestUnit `protobuf:"bytes,6,rep,name=vm_test_units,json=vmTestUnits,proto3" json:"vm_test_units,omitempty"`
+ DirectTastVmTestUnits []*TastVmTestUnit `protobuf:"bytes,7,rep,name=direct_tast_vm_test_units,json=directTastVmTestUnits,proto3" json:"direct_tast_vm_test_units,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
}
func (m *GenerateTestPlanResponse) Reset() { *m = GenerateTestPlanResponse{} }
@@ -139,20 +137,6 @@
return nil
}
-func (m *GenerateTestPlanResponse) GetMoblabVmTestUnits() []*MoblabVmTestUnit {
- if m != nil {
- return m.MoblabVmTestUnits
- }
- return nil
-}
-
-func (m *GenerateTestPlanResponse) GetTastVmTestUnits() []*TastVmTestUnit {
- if m != nil {
- return m.TastVmTestUnits
- }
- return nil
-}
-
func (m *GenerateTestPlanResponse) GetVmTestUnits() []*VmTestUnit {
if m != nil {
return m.VmTestUnits
@@ -335,53 +319,6 @@
return nil
}
-type MoblabVmTestUnit struct {
- Common *TestUnitCommon `protobuf:"bytes,1,opt,name=common,proto3" json:"common,omitempty"`
- MoblabVmTestCfg *MoblabVmTestCfg `protobuf:"bytes,2,opt,name=moblab_vm_test_cfg,json=moblabVmTestCfg,proto3" json:"moblab_vm_test_cfg,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *MoblabVmTestUnit) Reset() { *m = MoblabVmTestUnit{} }
-func (m *MoblabVmTestUnit) String() string { return proto.CompactTextString(m) }
-func (*MoblabVmTestUnit) ProtoMessage() {}
-func (*MoblabVmTestUnit) Descriptor() ([]byte, []int) {
- return fileDescriptor_e8083f85c67203f6, []int{5}
-}
-
-func (m *MoblabVmTestUnit) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_MoblabVmTestUnit.Unmarshal(m, b)
-}
-func (m *MoblabVmTestUnit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_MoblabVmTestUnit.Marshal(b, m, deterministic)
-}
-func (m *MoblabVmTestUnit) XXX_Merge(src proto.Message) {
- xxx_messageInfo_MoblabVmTestUnit.Merge(m, src)
-}
-func (m *MoblabVmTestUnit) XXX_Size() int {
- return xxx_messageInfo_MoblabVmTestUnit.Size(m)
-}
-func (m *MoblabVmTestUnit) XXX_DiscardUnknown() {
- xxx_messageInfo_MoblabVmTestUnit.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_MoblabVmTestUnit proto.InternalMessageInfo
-
-func (m *MoblabVmTestUnit) GetCommon() *TestUnitCommon {
- if m != nil {
- return m.Common
- }
- return nil
-}
-
-func (m *MoblabVmTestUnit) GetMoblabVmTestCfg() *MoblabVmTestCfg {
- if m != nil {
- return m.MoblabVmTestCfg
- }
- return nil
-}
-
type TastVmTestUnit struct {
Common *TestUnitCommon `protobuf:"bytes,1,opt,name=common,proto3" json:"common,omitempty"`
TastVmTestCfg *TastVmTestCfg `protobuf:"bytes,2,opt,name=tast_vm_test_cfg,json=tastVmTestCfg,proto3" json:"tast_vm_test_cfg,omitempty"`
@@ -394,7 +331,7 @@
func (m *TastVmTestUnit) String() string { return proto.CompactTextString(m) }
func (*TastVmTestUnit) ProtoMessage() {}
func (*TastVmTestUnit) Descriptor() ([]byte, []int) {
- return fileDescriptor_e8083f85c67203f6, []int{6}
+ return fileDescriptor_e8083f85c67203f6, []int{5}
}
func (m *TastVmTestUnit) XXX_Unmarshal(b []byte) error {
@@ -441,7 +378,7 @@
func (m *VmTestUnit) String() string { return proto.CompactTextString(m) }
func (*VmTestUnit) ProtoMessage() {}
func (*VmTestUnit) Descriptor() ([]byte, []int) {
- return fileDescriptor_e8083f85c67203f6, []int{7}
+ return fileDescriptor_e8083f85c67203f6, []int{6}
}
func (m *VmTestUnit) XXX_Unmarshal(b []byte) error {
@@ -482,7 +419,6 @@
proto.RegisterType((*BuildPayload)(nil), "testplans.BuildPayload")
proto.RegisterType((*TestUnitCommon)(nil), "testplans.TestUnitCommon")
proto.RegisterType((*HwTestUnit)(nil), "testplans.HwTestUnit")
- proto.RegisterType((*MoblabVmTestUnit)(nil), "testplans.MoblabVmTestUnit")
proto.RegisterType((*TastVmTestUnit)(nil), "testplans.TastVmTestUnit")
proto.RegisterType((*VmTestUnit)(nil), "testplans.VmTestUnit")
}
@@ -490,50 +426,46 @@
func init() { proto.RegisterFile("testplans/generate_test_plan.proto", fileDescriptor_e8083f85c67203f6) }
var fileDescriptor_e8083f85c67203f6 = []byte{
- // 705 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcf, 0x6f, 0xd3, 0x30,
- 0x14, 0x56, 0xd7, 0xb1, 0xad, 0xee, 0xba, 0xae, 0x66, 0x63, 0xd9, 0xe0, 0x30, 0x72, 0x61, 0xe2,
- 0x90, 0x0a, 0x36, 0x0e, 0xa0, 0x5d, 0xd6, 0x22, 0x86, 0x10, 0xa0, 0x2a, 0x1b, 0x1c, 0xb8, 0x44,
- 0x4e, 0xe6, 0x24, 0x16, 0x49, 0xdc, 0xd9, 0x2f, 0x9b, 0x7a, 0x44, 0x42, 0x1c, 0xf9, 0x4f, 0x10,
- 0xff, 0x22, 0x8a, 0x9d, 0x9f, 0xed, 0x06, 0xd2, 0xb8, 0xc5, 0xcf, 0xdf, 0xfb, 0xde, 0xe7, 0xe7,
- 0xf7, 0xc5, 0xc8, 0x04, 0x2a, 0x61, 0x1a, 0x91, 0x44, 0x0e, 0x03, 0x9a, 0x50, 0x41, 0x80, 0x3a,
- 0x59, 0xc8, 0xc9, 0x62, 0xd6, 0x54, 0x70, 0xe0, 0xb8, 0x53, 0x62, 0xf6, 0x76, 0xbc, 0x50, 0xf0,
- 0x98, 0xa5, 0x31, 0x97, 0x43, 0x8f, 0xc7, 0x31, 0xcf, 0x31, 0x7b, 0x8f, 0x02, 0xce, 0x83, 0x88,
- 0x0e, 0xd5, 0xca, 0x4d, 0xfd, 0xa1, 0x04, 0x91, 0x7a, 0x90, 0xef, 0x3e, 0xa8, 0xaa, 0x34, 0xb2,
- 0x86, 0x55, 0x1c, 0x88, 0x08, 0x28, 0xe8, 0xda, 0x82, 0x5e, 0xa6, 0x4c, 0xd0, 0x98, 0x26, 0x20,
- 0x1d, 0x8f, 0x27, 0x3e, 0x0b, 0x74, 0x82, 0xf9, 0x7d, 0x09, 0xed, 0x9c, 0xe6, 0x3a, 0xcf, 0xa9,
- 0x84, 0x49, 0x44, 0x12, 0x9b, 0x5e, 0xa6, 0x54, 0x02, 0x7e, 0x8d, 0xb0, 0x9b, 0xb2, 0xe8, 0xc2,
- 0x4d, 0xbd, 0xaf, 0x14, 0x1c, 0x95, 0x20, 0x8d, 0x7b, 0xfb, 0xed, 0x83, 0xee, 0xf3, 0x6d, 0xab,
- 0xac, 0x64, 0x4d, 0xb2, 0x8d, 0xd1, 0x0c, 0xa8, 0xb4, 0x07, 0xb5, 0x04, 0x15, 0x96, 0xf8, 0x09,
- 0xea, 0xc7, 0x24, 0x61, 0x7e, 0xa6, 0x23, 0xd3, 0xca, 0xc0, 0x58, 0xdd, 0x6f, 0x1d, 0x74, 0xec,
- 0x8d, 0x22, 0x3c, 0x56, 0x51, 0x7c, 0x8c, 0x36, 0x02, 0x06, 0x2c, 0xa2, 0xb2, 0xc0, 0x75, 0xf6,
- 0x5b, 0xb7, 0x97, 0xea, 0xe5, 0xe0, 0x5a, 0x36, 0x15, 0x82, 0x81, 0xe3, 0x85, 0x24, 0x09, 0xa8,
- 0x34, 0xd6, 0xfe, 0x26, 0xb4, 0xa7, 0xc1, 0x63, 0x8d, 0x35, 0xbf, 0xb5, 0x91, 0xb1, 0xd8, 0x06,
- 0x39, 0xe5, 0x89, 0xa4, 0xf8, 0x25, 0xea, 0x85, 0xd7, 0xba, 0x91, 0x69, 0xc2, 0x40, 0x1a, 0xed,
- 0x05, 0xe6, 0xb7, 0xd7, 0x59, 0xd6, 0xa7, 0x84, 0x81, 0xdd, 0x0d, 0xcb, 0x6f, 0x89, 0xdf, 0xa3,
- 0xad, 0x98, 0xbb, 0x11, 0x71, 0x9d, 0xab, 0xb8, 0xce, 0xb0, 0xac, 0x18, 0x1e, 0xd6, 0x18, 0x3e,
- 0x28, 0xd8, 0xe7, 0xb8, 0xe4, 0x19, 0xc4, 0x73, 0x11, 0x89, 0xdf, 0x20, 0x0c, 0x44, 0xc2, 0x1c,
- 0x97, 0xbe, 0x90, 0xdd, 0x1a, 0xd7, 0x39, 0x91, 0x50, 0x63, 0xea, 0x43, 0x63, 0x2d, 0xb3, 0x03,
- 0x35, 0x29, 0x56, 0x16, 0x0e, 0x54, 0x4b, 0xef, 0x5e, 0xd5, 0x52, 0xcf, 0xd0, 0xee, 0x05, 0x13,
- 0xd4, 0x03, 0xe7, 0x06, 0x25, 0xab, 0xff, 0x52, 0xb2, 0xad, 0x73, 0x9b, 0x51, 0xf9, 0x6e, 0x79,
- 0x6d, 0x69, 0xb3, 0x6d, 0xfe, 0x6e, 0xa1, 0xf5, 0x51, 0x36, 0x3e, 0x13, 0x32, 0x8b, 0x38, 0xb9,
- 0xc0, 0x16, 0xba, 0x4f, 0x04, 0x30, 0x9f, 0x78, 0x20, 0x9d, 0x40, 0x3a, 0x7a, 0xac, 0x8c, 0x96,
- 0x9a, 0x9e, 0x41, 0xb9, 0x75, 0x2a, 0x47, 0x6a, 0x03, 0x3f, 0x45, 0x83, 0x06, 0x7e, 0x4a, 0x20,
- 0x34, 0x96, 0x14, 0xba, 0x5f, 0x43, 0x4f, 0x08, 0x84, 0x78, 0x8c, 0x06, 0xbe, 0x1a, 0x35, 0x77,
- 0xe6, 0x14, 0x7b, 0x46, 0x5b, 0xcd, 0xdb, 0x8e, 0xa5, 0xad, 0x67, 0x15, 0xd6, 0xb3, 0xce, 0x94,
- 0xf5, 0xec, 0xbe, 0xca, 0x18, 0xcd, 0x4e, 0x72, 0xbc, 0xf9, 0xab, 0x85, 0x36, 0x8a, 0x53, 0x8c,
- 0x95, 0x0d, 0xf1, 0x2b, 0xb4, 0xae, 0x2c, 0xe0, 0x68, 0xfb, 0xa9, 0xf2, 0x19, 0x65, 0x65, 0x73,
- 0x4b, 0x9d, 0xf1, 0x5c, 0x6d, 0xdb, 0x5d, 0xb7, 0x5a, 0xe0, 0xc7, 0x79, 0x2e, 0x15, 0x4e, 0x42,
- 0x62, 0x6a, 0x2c, 0x2b, 0xe9, 0xdd, 0x3c, 0xf6, 0x91, 0xc4, 0x14, 0x1f, 0xa3, 0x9e, 0xa6, 0x9f,
- 0xea, 0x1e, 0x95, 0x92, 0xab, 0x96, 0xd7, 0x5b, 0x68, 0x6b, 0xc2, 0x7c, 0x65, 0xa6, 0x08, 0x55,
- 0x83, 0x8a, 0x9f, 0xa1, 0x15, 0xfd, 0xef, 0x50, 0x1d, 0x9d, 0xbb, 0xb7, 0xc6, 0xa9, 0xec, 0x1c,
- 0x88, 0x8f, 0x50, 0xb7, 0x70, 0x82, 0xe7, 0x07, 0xf9, 0xe1, 0xb6, 0x16, 0x7c, 0x30, 0xf6, 0x03,
- 0xbb, 0x13, 0x16, 0x9f, 0xe6, 0xcf, 0x16, 0xda, 0x9c, 0x1f, 0xef, 0xbb, 0x54, 0x3f, 0x45, 0x78,
- 0xce, 0x4c, 0x95, 0x88, 0xbd, 0x5b, 0xac, 0x94, 0x49, 0xe9, 0xc7, 0xcd, 0x80, 0xf9, 0x23, 0xbb,
- 0xb7, 0xc6, 0x0c, 0xde, 0x45, 0xce, 0x09, 0xda, 0x6c, 0x78, 0xa0, 0x12, 0x63, 0xdc, 0xe8, 0x80,
- 0x4c, 0x4a, 0x0f, 0xea, 0xcb, 0xec, 0x42, 0xfe, 0x4f, 0xc3, 0x11, 0xea, 0x2e, 0x96, 0xdf, 0x5a,
- 0xf0, 0xb1, 0xba, 0x90, 0xab, 0xe2, 0x73, 0xf4, 0xe2, 0xcb, 0x61, 0xc0, 0xcb, 0x91, 0xb4, 0xb8,
- 0x08, 0x86, 0xb5, 0x67, 0x88, 0x25, 0xbe, 0x20, 0xfa, 0xdd, 0x19, 0x06, 0xbc, 0x7a, 0x51, 0xdc,
- 0x15, 0x15, 0x3b, 0xfc, 0x13, 0x00, 0x00, 0xff, 0xff, 0x7b, 0x5d, 0xe1, 0x40, 0xe3, 0x06, 0x00,
- 0x00,
+ // 648 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xcf, 0x6f, 0xd3, 0x30,
+ 0x14, 0x56, 0xd7, 0xae, 0x6b, 0xdd, 0x75, 0x6b, 0xcd, 0xc6, 0xb2, 0x89, 0xc3, 0xc8, 0x85, 0x89,
+ 0x43, 0x22, 0xd8, 0x38, 0x80, 0x76, 0x59, 0x8b, 0x34, 0xb4, 0x03, 0xaa, 0xb2, 0xc1, 0x81, 0x4b,
+ 0xe4, 0x66, 0x8e, 0x63, 0xd1, 0xc4, 0x9d, 0xfd, 0xb2, 0xa9, 0x77, 0xc4, 0x7f, 0x83, 0xf8, 0xf3,
+ 0xb8, 0xa2, 0xd8, 0x49, 0x93, 0x10, 0xe0, 0x00, 0x37, 0xfb, 0xbd, 0xef, 0x7b, 0x3f, 0x3f, 0x1b,
+ 0xd9, 0x40, 0x15, 0x2c, 0x17, 0x24, 0x51, 0x2e, 0xa3, 0x09, 0x95, 0x04, 0xa8, 0x9f, 0x99, 0xfc,
+ 0xcc, 0xe6, 0x2c, 0xa5, 0x00, 0x81, 0xfb, 0x6b, 0xcc, 0xd1, 0x41, 0x10, 0x49, 0x11, 0xf3, 0x34,
+ 0x16, 0xca, 0x0d, 0x44, 0x1c, 0x8b, 0x1c, 0x73, 0xf4, 0x84, 0x09, 0xc1, 0x16, 0xd4, 0xd5, 0xb7,
+ 0x79, 0x1a, 0xba, 0x0a, 0x64, 0x1a, 0x40, 0xee, 0x7d, 0x5c, 0x66, 0xa9, 0xb1, 0xdc, 0xd2, 0x0e,
+ 0x44, 0x32, 0x0a, 0x26, 0xb7, 0xa4, 0x77, 0x29, 0x97, 0x34, 0xa6, 0x09, 0x28, 0x3f, 0x10, 0x49,
+ 0xc8, 0x99, 0x21, 0xd8, 0x5f, 0x36, 0xd0, 0xc1, 0x65, 0x5e, 0xe7, 0x0d, 0x55, 0x30, 0x5b, 0x90,
+ 0xc4, 0xa3, 0x77, 0x29, 0x55, 0x80, 0xdf, 0x22, 0x3c, 0x4f, 0xf9, 0xe2, 0x76, 0x9e, 0x06, 0x9f,
+ 0x29, 0xf8, 0x9a, 0xa0, 0xac, 0xcd, 0xe3, 0xf6, 0xc9, 0xe0, 0xe5, 0xbe, 0xb3, 0xce, 0xe4, 0xcc,
+ 0x32, 0xc7, 0x64, 0x05, 0x54, 0x79, 0xe3, 0x0a, 0x41, 0x9b, 0x15, 0x7e, 0x86, 0x76, 0x63, 0x92,
+ 0xf0, 0x30, 0xab, 0x23, 0xab, 0x95, 0x83, 0xb5, 0x75, 0xdc, 0x3a, 0xe9, 0x7b, 0x3b, 0x85, 0x79,
+ 0xaa, 0xad, 0xf8, 0x1c, 0xed, 0x30, 0x0e, 0x7c, 0x41, 0x55, 0x81, 0xeb, 0x1f, 0xb7, 0xfe, 0x9c,
+ 0x6a, 0x98, 0x83, 0x2b, 0x6c, 0x2a, 0x25, 0x07, 0x3f, 0x88, 0x48, 0xc2, 0xa8, 0xb2, 0x7a, 0x7f,
+ 0x2b, 0x74, 0x68, 0xc0, 0x53, 0x83, 0xb5, 0x7f, 0xb4, 0x90, 0xd5, 0x1c, 0x83, 0x5a, 0x8a, 0x44,
+ 0x51, 0xfc, 0x1a, 0x0d, 0xa3, 0x07, 0x33, 0xc8, 0x34, 0xe1, 0xa0, 0xac, 0x76, 0x23, 0xf2, 0xbb,
+ 0x87, 0x8c, 0xf5, 0x21, 0xe1, 0xe0, 0x0d, 0xa2, 0xf5, 0x59, 0x65, 0xd4, 0xfb, 0xb8, 0x4a, 0xed,
+ 0x36, 0xa8, 0x1f, 0xe3, 0x92, 0x7a, 0x1f, 0x97, 0xd4, 0x6b, 0x74, 0x78, 0xcb, 0x25, 0x0d, 0xc0,
+ 0x07, 0xa2, 0xc0, 0xaf, 0x87, 0xd9, 0xd2, 0x61, 0x0e, 0x2b, 0x61, 0x6e, 0x88, 0x82, 0x4a, 0xa8,
+ 0x7d, 0xc3, 0xad, 0x5b, 0xd5, 0x55, 0xa7, 0xb7, 0x31, 0x6a, 0x5f, 0x75, 0x7a, 0x9d, 0xd1, 0xe6,
+ 0x55, 0xa7, 0xb7, 0x39, 0xea, 0xda, 0xdf, 0x5b, 0x68, 0x7b, 0x92, 0x2d, 0x6d, 0x46, 0x56, 0x0b,
+ 0x41, 0x6e, 0xb1, 0x83, 0x1e, 0x11, 0x09, 0x3c, 0x24, 0x01, 0x28, 0x9f, 0x29, 0xdf, 0x2c, 0xd3,
+ 0x6a, 0xe9, 0x9d, 0x8d, 0xd7, 0xae, 0x4b, 0x35, 0xd1, 0x0e, 0xfc, 0x1c, 0x8d, 0x6b, 0xf8, 0x25,
+ 0x81, 0xc8, 0xda, 0xd0, 0xe8, 0xdd, 0x0a, 0x7a, 0x46, 0x20, 0xc2, 0x53, 0x34, 0x0e, 0xf5, 0x82,
+ 0xe7, 0x2b, 0xbf, 0xf0, 0x59, 0x6d, 0xbd, 0xe5, 0x03, 0xc7, 0x08, 0xde, 0x29, 0x04, 0xef, 0x5c,
+ 0x6b, 0xc1, 0x7b, 0xbb, 0x9a, 0x31, 0x59, 0x5d, 0xe4, 0x78, 0xfb, 0x5b, 0x0b, 0xed, 0x14, 0x1d,
+ 0x4d, 0xb5, 0xf8, 0xf1, 0x1b, 0xb4, 0xad, 0x85, 0xe7, 0x1b, 0xd1, 0xeb, 0xf4, 0x59, 0xc8, 0xf2,
+ 0x71, 0x39, 0xba, 0xc7, 0x1b, 0xed, 0xf6, 0x06, 0xf3, 0xf2, 0x82, 0x9f, 0xe6, 0x5c, 0x2a, 0xfd,
+ 0x84, 0xc4, 0xd4, 0xea, 0xe8, 0xd2, 0x07, 0xb9, 0xed, 0x3d, 0x89, 0x29, 0x3e, 0x47, 0x43, 0x13,
+ 0x7e, 0x69, 0x66, 0xb4, 0x2e, 0xb9, 0x1c, 0x7f, 0x75, 0x84, 0x9e, 0x09, 0x98, 0xdf, 0xec, 0x14,
+ 0xa1, 0x52, 0x1e, 0xf8, 0x05, 0xea, 0x9a, 0x17, 0xab, 0x27, 0xfa, 0xcb, 0x0e, 0x6b, 0x5d, 0x79,
+ 0x39, 0x10, 0x9f, 0xa1, 0x41, 0xa1, 0xbf, 0x20, 0x64, 0x79, 0x73, 0x7b, 0x0d, 0xf5, 0x4d, 0x43,
+ 0xe6, 0xf5, 0xa3, 0xe2, 0x68, 0x7f, 0xcd, 0xc6, 0x54, 0x5b, 0xff, 0xbf, 0xe4, 0xbe, 0x40, 0xa3,
+ 0x9a, 0xfc, 0xca, 0x02, 0xac, 0xdf, 0x8a, 0x2f, 0x2b, 0x62, 0x08, 0xd5, 0x6b, 0xd6, 0xff, 0xff,
+ 0xd5, 0x70, 0x86, 0x06, 0xcd, 0xf4, 0x7b, 0x8d, 0x27, 0xa4, 0xfb, 0xbf, 0x2f, 0x8e, 0x93, 0x57,
+ 0x9f, 0x4e, 0x99, 0x58, 0x2b, 0xc0, 0x11, 0x92, 0xb9, 0x95, 0xbf, 0x96, 0x27, 0xa1, 0x24, 0xe6,
+ 0x73, 0x75, 0x99, 0x28, 0xbf, 0xcd, 0x79, 0x57, 0xdb, 0x4e, 0x7f, 0x06, 0x00, 0x00, 0xff, 0xff,
+ 0x1e, 0xed, 0xa7, 0x43, 0xc8, 0x05, 0x00, 0x00,
}
diff --git a/go/testplans/target_test_requirements_config.pb.go b/go/testplans/target_test_requirements_config.pb.go
index 7cb63a8..ee2f580 100644
--- a/go/testplans/target_test_requirements_config.pb.go
+++ b/go/testplans/target_test_requirements_config.pb.go
@@ -285,93 +285,6 @@
return ""
}
-type MoblabVmTestCfg struct {
- MoblabTest []*MoblabVmTestCfg_MoblabTest `protobuf:"bytes,1,rep,name=moblab_test,json=moblabTest,proto3" json:"moblab_test,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *MoblabVmTestCfg) Reset() { *m = MoblabVmTestCfg{} }
-func (m *MoblabVmTestCfg) String() string { return proto.CompactTextString(m) }
-func (*MoblabVmTestCfg) ProtoMessage() {}
-func (*MoblabVmTestCfg) Descriptor() ([]byte, []int) {
- return fileDescriptor_4af54ecd79c6f0f9, []int{2}
-}
-
-func (m *MoblabVmTestCfg) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_MoblabVmTestCfg.Unmarshal(m, b)
-}
-func (m *MoblabVmTestCfg) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_MoblabVmTestCfg.Marshal(b, m, deterministic)
-}
-func (m *MoblabVmTestCfg) XXX_Merge(src proto.Message) {
- xxx_messageInfo_MoblabVmTestCfg.Merge(m, src)
-}
-func (m *MoblabVmTestCfg) XXX_Size() int {
- return xxx_messageInfo_MoblabVmTestCfg.Size(m)
-}
-func (m *MoblabVmTestCfg) XXX_DiscardUnknown() {
- xxx_messageInfo_MoblabVmTestCfg.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_MoblabVmTestCfg proto.InternalMessageInfo
-
-func (m *MoblabVmTestCfg) GetMoblabTest() []*MoblabVmTestCfg_MoblabTest {
- if m != nil {
- return m.MoblabTest
- }
- return nil
-}
-
-type MoblabVmTestCfg_MoblabTest struct {
- Common *TestSuiteCommon `protobuf:"bytes,3,opt,name=common,proto3" json:"common,omitempty"`
- // Test type to be run.
- TestType string `protobuf:"bytes,1,opt,name=test_type,json=testType,proto3" json:"test_type,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *MoblabVmTestCfg_MoblabTest) Reset() { *m = MoblabVmTestCfg_MoblabTest{} }
-func (m *MoblabVmTestCfg_MoblabTest) String() string { return proto.CompactTextString(m) }
-func (*MoblabVmTestCfg_MoblabTest) ProtoMessage() {}
-func (*MoblabVmTestCfg_MoblabTest) Descriptor() ([]byte, []int) {
- return fileDescriptor_4af54ecd79c6f0f9, []int{2, 0}
-}
-
-func (m *MoblabVmTestCfg_MoblabTest) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_MoblabVmTestCfg_MoblabTest.Unmarshal(m, b)
-}
-func (m *MoblabVmTestCfg_MoblabTest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_MoblabVmTestCfg_MoblabTest.Marshal(b, m, deterministic)
-}
-func (m *MoblabVmTestCfg_MoblabTest) XXX_Merge(src proto.Message) {
- xxx_messageInfo_MoblabVmTestCfg_MoblabTest.Merge(m, src)
-}
-func (m *MoblabVmTestCfg_MoblabTest) XXX_Size() int {
- return xxx_messageInfo_MoblabVmTestCfg_MoblabTest.Size(m)
-}
-func (m *MoblabVmTestCfg_MoblabTest) XXX_DiscardUnknown() {
- xxx_messageInfo_MoblabVmTestCfg_MoblabTest.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_MoblabVmTestCfg_MoblabTest proto.InternalMessageInfo
-
-func (m *MoblabVmTestCfg_MoblabTest) GetCommon() *TestSuiteCommon {
- if m != nil {
- return m.Common
- }
- return nil
-}
-
-func (m *MoblabVmTestCfg_MoblabTest) GetTestType() string {
- if m != nil {
- return m.TestType
- }
- return ""
-}
-
type TastVmTestCfg struct {
TastVmTest []*TastVmTestCfg_TastVmTest `protobuf:"bytes,1,rep,name=tast_vm_test,json=tastVmTest,proto3" json:"tast_vm_test,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -383,7 +296,7 @@
func (m *TastVmTestCfg) String() string { return proto.CompactTextString(m) }
func (*TastVmTestCfg) ProtoMessage() {}
func (*TastVmTestCfg) Descriptor() ([]byte, []int) {
- return fileDescriptor_4af54ecd79c6f0f9, []int{3}
+ return fileDescriptor_4af54ecd79c6f0f9, []int{2}
}
func (m *TastVmTestCfg) XXX_Unmarshal(b []byte) error {
@@ -423,7 +336,7 @@
func (m *TastVmTestCfg_TastTestExpr) String() string { return proto.CompactTextString(m) }
func (*TastVmTestCfg_TastTestExpr) ProtoMessage() {}
func (*TastVmTestCfg_TastTestExpr) Descriptor() ([]byte, []int) {
- return fileDescriptor_4af54ecd79c6f0f9, []int{3, 0}
+ return fileDescriptor_4af54ecd79c6f0f9, []int{2, 0}
}
func (m *TastVmTestCfg_TastTestExpr) XXX_Unmarshal(b []byte) error {
@@ -468,7 +381,7 @@
func (m *TastVmTestCfg_TastVmTest) String() string { return proto.CompactTextString(m) }
func (*TastVmTestCfg_TastVmTest) ProtoMessage() {}
func (*TastVmTestCfg_TastVmTest) Descriptor() ([]byte, []int) {
- return fileDescriptor_4af54ecd79c6f0f9, []int{3, 1}
+ return fileDescriptor_4af54ecd79c6f0f9, []int{2, 1}
}
func (m *TastVmTestCfg_TastVmTest) XXX_Unmarshal(b []byte) error {
@@ -521,7 +434,7 @@
func (m *VmTestCfg) String() string { return proto.CompactTextString(m) }
func (*VmTestCfg) ProtoMessage() {}
func (*VmTestCfg) Descriptor() ([]byte, []int) {
- return fileDescriptor_4af54ecd79c6f0f9, []int{4}
+ return fileDescriptor_4af54ecd79c6f0f9, []int{3}
}
func (m *VmTestCfg) XXX_Unmarshal(b []byte) error {
@@ -562,7 +475,7 @@
func (m *VmTestCfg_VmTest) String() string { return proto.CompactTextString(m) }
func (*VmTestCfg_VmTest) ProtoMessage() {}
func (*VmTestCfg_VmTest) Descriptor() ([]byte, []int) {
- return fileDescriptor_4af54ecd79c6f0f9, []int{4, 0}
+ return fileDescriptor_4af54ecd79c6f0f9, []int{3, 0}
}
func (m *VmTestCfg_VmTest) XXX_Unmarshal(b []byte) error {
@@ -617,7 +530,7 @@
func (m *TargetCriteria) String() string { return proto.CompactTextString(m) }
func (*TargetCriteria) ProtoMessage() {}
func (*TargetCriteria) Descriptor() ([]byte, []int) {
- return fileDescriptor_4af54ecd79c6f0f9, []int{5}
+ return fileDescriptor_4af54ecd79c6f0f9, []int{4}
}
func (m *TargetCriteria) XXX_Unmarshal(b []byte) error {
@@ -681,21 +594,19 @@
// Specifies the crieria for builds to target for testing.
TargetCriteria *TargetCriteria `protobuf:"bytes,1,opt,name=target_criteria,json=targetCriteria,proto3" json:"target_criteria,omitempty"`
// These configure what testing is needed for these BuildCriteria.
- HwTestCfg *HwTestCfg `protobuf:"bytes,3,opt,name=hw_test_cfg,json=hwTestCfg,proto3" json:"hw_test_cfg,omitempty"`
- MoblabVmTestCfg *MoblabVmTestCfg `protobuf:"bytes,4,opt,name=moblab_vm_test_cfg,json=moblabVmTestCfg,proto3" json:"moblab_vm_test_cfg,omitempty"`
- VmTestCfg *VmTestCfg `protobuf:"bytes,5,opt,name=vm_test_cfg,json=vmTestCfg,proto3" json:"vm_test_cfg,omitempty"`
- TastVmTestCfg *TastVmTestCfg `protobuf:"bytes,6,opt,name=tast_vm_test_cfg,json=tastVmTestCfg,proto3" json:"tast_vm_test_cfg,omitempty"`
- DirectTastVmTestCfg *TastVmTestCfg `protobuf:"bytes,7,opt,name=direct_tast_vm_test_cfg,json=directTastVmTestCfg,proto3" json:"direct_tast_vm_test_cfg,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
+ HwTestCfg *HwTestCfg `protobuf:"bytes,3,opt,name=hw_test_cfg,json=hwTestCfg,proto3" json:"hw_test_cfg,omitempty"`
+ VmTestCfg *VmTestCfg `protobuf:"bytes,5,opt,name=vm_test_cfg,json=vmTestCfg,proto3" json:"vm_test_cfg,omitempty"`
+ DirectTastVmTestCfg *TastVmTestCfg `protobuf:"bytes,7,opt,name=direct_tast_vm_test_cfg,json=directTastVmTestCfg,proto3" json:"direct_tast_vm_test_cfg,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
}
func (m *PerTargetTestRequirements) Reset() { *m = PerTargetTestRequirements{} }
func (m *PerTargetTestRequirements) String() string { return proto.CompactTextString(m) }
func (*PerTargetTestRequirements) ProtoMessage() {}
func (*PerTargetTestRequirements) Descriptor() ([]byte, []int) {
- return fileDescriptor_4af54ecd79c6f0f9, []int{6}
+ return fileDescriptor_4af54ecd79c6f0f9, []int{5}
}
func (m *PerTargetTestRequirements) XXX_Unmarshal(b []byte) error {
@@ -730,13 +641,6 @@
return nil
}
-func (m *PerTargetTestRequirements) GetMoblabVmTestCfg() *MoblabVmTestCfg {
- if m != nil {
- return m.MoblabVmTestCfg
- }
- return nil
-}
-
func (m *PerTargetTestRequirements) GetVmTestCfg() *VmTestCfg {
if m != nil {
return m.VmTestCfg
@@ -744,13 +648,6 @@
return nil
}
-func (m *PerTargetTestRequirements) GetTastVmTestCfg() *TastVmTestCfg {
- if m != nil {
- return m.TastVmTestCfg
- }
- return nil
-}
-
func (m *PerTargetTestRequirements) GetDirectTastVmTestCfg() *TastVmTestCfg {
if m != nil {
return m.DirectTastVmTestCfg
@@ -771,7 +668,7 @@
func (m *TargetTestRequirementsCfg) String() string { return proto.CompactTextString(m) }
func (*TargetTestRequirementsCfg) ProtoMessage() {}
func (*TargetTestRequirementsCfg) Descriptor() ([]byte, []int) {
- return fileDescriptor_4af54ecd79c6f0f9, []int{7}
+ return fileDescriptor_4af54ecd79c6f0f9, []int{6}
}
func (m *TargetTestRequirementsCfg) XXX_Unmarshal(b []byte) error {
@@ -805,8 +702,6 @@
proto.RegisterType((*TestSuiteCommon_TestSuiteGroup)(nil), "testplans.TestSuiteCommon.TestSuiteGroup")
proto.RegisterType((*HwTestCfg)(nil), "testplans.HwTestCfg")
proto.RegisterType((*HwTestCfg_HwTest)(nil), "testplans.HwTestCfg.HwTest")
- proto.RegisterType((*MoblabVmTestCfg)(nil), "testplans.MoblabVmTestCfg")
- proto.RegisterType((*MoblabVmTestCfg_MoblabTest)(nil), "testplans.MoblabVmTestCfg.MoblabTest")
proto.RegisterType((*TastVmTestCfg)(nil), "testplans.TastVmTestCfg")
proto.RegisterType((*TastVmTestCfg_TastTestExpr)(nil), "testplans.TastVmTestCfg.TastTestExpr")
proto.RegisterType((*TastVmTestCfg_TastVmTest)(nil), "testplans.TastVmTestCfg.TastVmTest")
@@ -822,64 +717,59 @@
}
var fileDescriptor_4af54ecd79c6f0f9 = []byte{
- // 933 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x41, 0x8f, 0xdb, 0x44,
- 0x14, 0xae, 0x93, 0x34, 0xeb, 0x3c, 0x67, 0x93, 0x30, 0x54, 0xc2, 0x9b, 0x42, 0xb5, 0xa4, 0x20,
- 0x05, 0x81, 0x12, 0x29, 0x5d, 0x38, 0x70, 0xdb, 0x6c, 0xd3, 0xee, 0x2e, 0xda, 0x65, 0x71, 0xbc,
- 0x45, 0x70, 0xb1, 0x6c, 0x67, 0xe2, 0x58, 0xd8, 0x19, 0x33, 0x9e, 0xec, 0x36, 0x57, 0x24, 0xfe,
- 0x03, 0xbf, 0x01, 0xa9, 0x17, 0x4e, 0x9c, 0xf8, 0x6d, 0xc8, 0x33, 0x13, 0x7b, 0x9c, 0x34, 0xd0,
- 0x9e, 0x32, 0xf3, 0xe6, 0xbd, 0x79, 0xdf, 0xf7, 0xbe, 0x79, 0x2f, 0x86, 0x21, 0xc3, 0x29, 0x4b,
- 0x22, 0x77, 0x99, 0x0e, 0x99, 0x4b, 0x03, 0xcc, 0x9c, 0xcc, 0xe0, 0x50, 0xfc, 0xeb, 0x2a, 0xa4,
- 0x38, 0xc6, 0x4b, 0x96, 0x3a, 0x3e, 0x59, 0xce, 0xc3, 0x60, 0x90, 0x50, 0xc2, 0x08, 0x6a, 0xe4,
- 0x01, 0xdd, 0x27, 0x01, 0x21, 0x41, 0x84, 0x87, 0xfc, 0xc0, 0x5b, 0xcd, 0x87, 0xf7, 0xd4, 0x4d,
- 0x12, 0x4c, 0x53, 0xe1, 0xda, 0x7b, 0x53, 0x81, 0xb6, 0x8d, 0x53, 0x36, 0x5d, 0x85, 0x0c, 0x9f,
- 0x91, 0x38, 0x26, 0x4b, 0xf4, 0x29, 0x34, 0x67, 0x61, 0x9a, 0x44, 0xee, 0xda, 0x59, 0xba, 0x31,
- 0x36, 0xb5, 0x63, 0xad, 0xdf, 0xb0, 0x0c, 0x69, 0xbb, 0x76, 0x63, 0x8c, 0xbe, 0x01, 0xdd, 0xa7,
- 0x21, 0x0b, 0x7d, 0x37, 0x32, 0x2b, 0xc7, 0x5a, 0xdf, 0x18, 0x75, 0x07, 0x22, 0xd3, 0x60, 0x93,
- 0x69, 0x30, 0x26, 0x24, 0x7a, 0xe5, 0x46, 0x2b, 0x6c, 0xe5, 0xbe, 0xe8, 0x16, 0x3e, 0xe0, 0xd8,
- 0xd3, 0x2c, 0x9d, 0x13, 0x50, 0xb2, 0x4a, 0x52, 0xb3, 0x7a, 0x5c, 0xed, 0x1b, 0xa3, 0x2f, 0x06,
- 0x39, 0xea, 0xc1, 0x16, 0xa2, 0x62, 0xff, 0x32, 0x8b, 0xb0, 0xda, 0xac, 0xb4, 0x4f, 0xd1, 0x57,
- 0x80, 0x66, 0x61, 0xea, 0x7a, 0x11, 0x76, 0xbc, 0xb5, 0x33, 0xc3, 0x73, 0x77, 0x15, 0x31, 0xb3,
- 0x76, 0xac, 0xf5, 0x75, 0xab, 0x23, 0x4f, 0xc6, 0xeb, 0xe7, 0xc2, 0xde, 0xfd, 0x16, 0x5a, 0xe5,
- 0x0b, 0x51, 0x1f, 0x3a, 0xdb, 0xb0, 0x24, 0xeb, 0x56, 0x39, 0x55, 0xef, 0x8f, 0x2a, 0x34, 0xce,
- 0xef, 0xb3, 0xf0, 0xb3, 0x79, 0x80, 0x4e, 0xe0, 0x60, 0x71, 0xcf, 0xd5, 0x30, 0x35, 0x4e, 0xe2,
- 0xb1, 0x42, 0x22, 0x77, 0x93, 0x2b, 0xab, 0xbe, 0xe0, 0xbf, 0xdd, 0xdf, 0x2b, 0x50, 0x17, 0x26,
- 0x34, 0x82, 0xba, 0xcf, 0x29, 0x9a, 0x4d, 0x59, 0xc5, 0xbd, 0x45, 0xb0, 0xa4, 0x27, 0x7a, 0x04,
- 0x0f, 0x39, 0x4e, 0x89, 0x50, 0x6c, 0x32, 0xd1, 0xd2, 0x5f, 0xd6, 0x91, 0xeb, 0x39, 0x1e, 0x71,
- 0xe9, 0xcc, 0x34, 0x84, 0x68, 0xc2, 0x36, 0xce, 0x4c, 0x8a, 0x4b, 0x4c, 0x66, 0x38, 0x32, 0xdb,
- 0xaa, 0xcb, 0x55, 0x66, 0x42, 0x3f, 0x00, 0x92, 0x84, 0x64, 0x2d, 0xd8, 0x3a, 0xc1, 0xe6, 0xe1,
- 0xb1, 0xd6, 0x6f, 0x8d, 0x3e, 0xfb, 0x0f, 0x6e, 0x1c, 0xa7, 0xbd, 0x4e, 0xb0, 0xd5, 0x5e, 0x94,
- 0x0d, 0x08, 0x41, 0x2d, 0x21, 0x24, 0x32, 0x5b, 0x3c, 0x1b, 0x5f, 0x5f, 0xd6, 0xf4, 0x4a, 0xc7,
- 0xe8, 0x5d, 0x41, 0x7b, 0x2b, 0x1a, 0xf5, 0xe0, 0xc9, 0xf9, 0x8f, 0x8e, 0x3d, 0x99, 0xda, 0xce,
- 0xf4, 0xf6, 0xc2, 0x9e, 0x38, 0xf6, 0x4f, 0x37, 0x13, 0xe7, 0xf6, 0x7a, 0x7a, 0x33, 0x39, 0xbb,
- 0x78, 0x71, 0x31, 0x79, 0xde, 0x79, 0x80, 0x9a, 0xa0, 0x9f, 0xde, 0xda, 0xdf, 0x67, 0x4e, 0x1d,
- 0x0d, 0xe9, 0x50, 0xb3, 0x4f, 0xa7, 0x76, 0xa7, 0xd2, 0xfb, 0x47, 0x83, 0xf6, 0x15, 0xf1, 0x22,
- 0xd7, 0x7b, 0x15, 0x6f, 0x04, 0x7a, 0x01, 0x46, 0xcc, 0x4d, 0xaa, 0x48, 0x9f, 0x2b, 0x44, 0xb6,
- 0x02, 0xe4, 0x9e, 0xcb, 0x05, 0x71, 0xbe, 0xee, 0xfa, 0x00, 0xc5, 0x89, 0xa2, 0x5a, 0xf5, 0x9d,
- 0x55, 0x7b, 0x0c, 0xbc, 0x2b, 0x45, 0x41, 0x85, 0x72, 0x7a, 0x66, 0xc8, 0x68, 0xf3, 0x7a, 0x54,
- 0x7b, 0x7f, 0x57, 0xe0, 0xd0, 0x76, 0x53, 0x56, 0xc0, 0x9f, 0x40, 0x93, 0xb9, 0x29, 0x73, 0xee,
- 0x62, 0x15, 0xff, 0x53, 0x35, 0x9d, 0xea, 0xaf, 0xec, 0x2c, 0x60, 0xf9, 0xba, 0xfb, 0x25, 0x34,
- 0xb3, 0x93, 0x6c, 0x3d, 0x79, 0x9d, 0xd0, 0x1c, 0x0b, 0x7e, 0x9d, 0x50, 0x15, 0x4b, 0x76, 0xd8,
- 0xfd, 0x4b, 0x03, 0x28, 0xee, 0x51, 0xb8, 0xd6, 0xde, 0x99, 0xeb, 0x27, 0x00, 0xe2, 0xf5, 0x28,
- 0xe3, 0xa3, 0xc1, 0x2d, 0x7c, 0x78, 0x7c, 0x07, 0x2d, 0xce, 0xaa, 0xc0, 0x50, 0xd9, 0xd1, 0x65,
- 0x97, 0xd7, 0x06, 0xbd, 0xc5, 0x4b, 0xb2, 0xd9, 0x5d, 0xd6, 0xf4, 0x6a, 0xa7, 0xd6, 0xfb, 0x53,
- 0x83, 0x46, 0x51, 0xb6, 0x13, 0x38, 0x28, 0x57, 0x4c, 0x6d, 0xcb, 0xe2, 0x56, 0x59, 0xa9, 0xfa,
- 0x9d, 0xa8, 0x52, 0x00, 0xf5, 0x1d, 0xce, 0xfa, 0xfb, 0x70, 0x2e, 0xda, 0x86, 0xcf, 0xc4, 0x86,
- 0xd5, 0xc8, 0x87, 0xc7, 0x65, 0x4d, 0xd7, 0x3a, 0x15, 0x0e, 0x56, 0xef, 0x05, 0xd0, 0xb2, 0xf9,
- 0x1c, 0x3f, 0xa3, 0x21, 0xc3, 0x34, 0x74, 0xd1, 0x53, 0x68, 0x7a, 0xab, 0x30, 0x9a, 0x39, 0x62,
- 0xbe, 0x8b, 0xf0, 0xf3, 0x07, 0x96, 0xc1, 0xad, 0xc2, 0x39, 0x6b, 0x5f, 0xbe, 0xc5, 0x54, 0xd4,
- 0xb5, 0x2a, 0xda, 0x57, 0xda, 0xb2, 0xca, 0x8e, 0x0f, 0xc1, 0xd8, 0xfc, 0x43, 0xac, 0x13, 0xdc,
- 0x7b, 0x53, 0x85, 0xa3, 0x1b, 0x4c, 0x45, 0x3c, 0xe7, 0xaa, 0xfc, 0x65, 0xa0, 0x31, 0xb4, 0xa5,
- 0xb3, 0x2f, 0x71, 0x70, 0xa9, 0x8c, 0xd1, 0x51, 0x49, 0x07, 0x15, 0xa8, 0xd5, 0x62, 0x65, 0xe0,
- 0x27, 0x60, 0x6c, 0xe6, 0x85, 0x3f, 0x0f, 0x64, 0x3b, 0x3c, 0x7a, 0xdb, 0xa0, 0xb0, 0x1a, 0x8b,
- 0x7c, 0x6c, 0xbe, 0x04, 0x24, 0xbb, 0x52, 0xca, 0xc4, 0x83, 0x77, 0xdf, 0xd7, 0x56, 0x73, 0x5a,
- 0xed, 0x78, 0xab, 0xbd, 0x4f, 0xc0, 0x50, 0x6f, 0x78, 0xb8, 0x93, 0xbe, 0x88, 0x6d, 0xdc, 0xe5,
- 0x51, 0xa7, 0xd0, 0x51, 0xbb, 0x8a, 0x87, 0xd6, 0x79, 0xa8, 0xb9, 0xef, 0x05, 0x5a, 0x87, 0xac,
- 0xd4, 0x98, 0xd7, 0xf0, 0xd1, 0x2c, 0xa4, 0xd8, 0x67, 0xce, 0xce, 0x4d, 0x07, 0xff, 0x73, 0xd3,
- 0x87, 0x22, 0xb0, 0x64, 0x94, 0x03, 0xe0, 0x37, 0x0d, 0x8e, 0xde, 0x2e, 0x56, 0x96, 0x13, 0xc3,
- 0xc7, 0x09, 0xa6, 0xce, 0xbe, 0x4f, 0x00, 0xf9, 0xd4, 0xd5, 0x29, 0xbd, 0x57, 0x7b, 0xeb, 0x28,
- 0xd9, 0x77, 0x34, 0xfe, 0xfa, 0xe7, 0x67, 0x01, 0x19, 0xf8, 0x0b, 0x4a, 0xe2, 0x70, 0x15, 0x0f,
- 0x08, 0x0d, 0x86, 0x9b, 0x0d, 0x49, 0x87, 0xe1, 0x72, 0x4e, 0x5d, 0xf1, 0x35, 0x31, 0x0c, 0x48,
- 0xf1, 0x65, 0xe2, 0xd5, 0xb9, 0xed, 0xd9, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x06, 0x68, 0x3b,
- 0xd1, 0xad, 0x08, 0x00, 0x00,
+ // 864 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0x51, 0x6f, 0xe3, 0x44,
+ 0x10, 0x3e, 0x27, 0x6e, 0x6a, 0x8f, 0xd3, 0xc4, 0x2c, 0x27, 0xe1, 0xe6, 0xe0, 0x14, 0x72, 0x20,
+ 0x05, 0x81, 0x12, 0x29, 0x57, 0x78, 0xe0, 0xed, 0xd2, 0x0b, 0xb4, 0x41, 0x57, 0x8a, 0xe3, 0x1e,
+ 0x82, 0x97, 0xd5, 0x26, 0xd9, 0x38, 0x16, 0x76, 0xd6, 0xac, 0x37, 0xed, 0xe5, 0x15, 0x89, 0xff,
+ 0xc0, 0x6f, 0x40, 0xe2, 0x85, 0x27, 0x7e, 0x1e, 0xf2, 0xee, 0x26, 0xb1, 0x7b, 0x97, 0x0a, 0x9e,
+ 0xbc, 0x33, 0x3b, 0xb3, 0xfb, 0xcd, 0xf7, 0xed, 0x8c, 0xa1, 0x2f, 0x68, 0x26, 0xd2, 0x98, 0xac,
+ 0xb2, 0xbe, 0x20, 0x3c, 0xa4, 0x02, 0xe7, 0x0e, 0xcc, 0xe9, 0xaf, 0xeb, 0x88, 0xd3, 0x84, 0xae,
+ 0x44, 0x86, 0x67, 0x6c, 0xb5, 0x88, 0xc2, 0x5e, 0xca, 0x99, 0x60, 0xc8, 0xde, 0x25, 0xb4, 0x9e,
+ 0x86, 0x8c, 0x85, 0x31, 0xed, 0xcb, 0x8d, 0xe9, 0x7a, 0xd1, 0xbf, 0xe3, 0x24, 0x4d, 0x29, 0xcf,
+ 0x54, 0x68, 0xe7, 0xaf, 0x0a, 0x34, 0x03, 0x9a, 0x89, 0xc9, 0x3a, 0x12, 0xf4, 0x9c, 0x25, 0x09,
+ 0x5b, 0xa1, 0x8f, 0xa1, 0x3e, 0x8f, 0xb2, 0x34, 0x26, 0x1b, 0xbc, 0x22, 0x09, 0xf5, 0x8c, 0xb6,
+ 0xd1, 0xb5, 0x7d, 0x47, 0xfb, 0xae, 0x48, 0x42, 0xd1, 0x57, 0x60, 0xcd, 0x78, 0x24, 0xa2, 0x19,
+ 0x89, 0xbd, 0x4a, 0xdb, 0xe8, 0x3a, 0x83, 0x56, 0x4f, 0xdd, 0xd4, 0xdb, 0xde, 0xd4, 0x1b, 0x32,
+ 0x16, 0xbf, 0x26, 0xf1, 0x9a, 0xfa, 0xbb, 0x58, 0x74, 0x03, 0xef, 0x49, 0xec, 0x59, 0x7e, 0x1d,
+ 0x0e, 0x39, 0x5b, 0xa7, 0x99, 0x57, 0x6d, 0x57, 0xbb, 0xce, 0xe0, 0xb3, 0xde, 0x0e, 0x75, 0xef,
+ 0x1e, 0xa2, 0xbd, 0xfd, 0x6d, 0x9e, 0xe1, 0x37, 0x45, 0xc9, 0xce, 0xd0, 0x17, 0x80, 0xe6, 0x51,
+ 0x46, 0xa6, 0x31, 0xc5, 0xd3, 0x0d, 0x9e, 0xd3, 0x05, 0x59, 0xc7, 0xc2, 0x33, 0xdb, 0x46, 0xd7,
+ 0xf2, 0x5d, 0xbd, 0x33, 0xdc, 0xbc, 0x54, 0xfe, 0xd6, 0xd7, 0xd0, 0x28, 0x1f, 0x88, 0xba, 0xe0,
+ 0xde, 0x87, 0xa5, 0xab, 0x6e, 0x94, 0xaf, 0xea, 0xfc, 0x51, 0x05, 0xfb, 0xe2, 0x2e, 0x4f, 0x3f,
+ 0x5f, 0x84, 0xe8, 0x0c, 0x8e, 0x97, 0x77, 0x52, 0x0d, 0xcf, 0x90, 0x45, 0x3c, 0x29, 0x14, 0xb1,
+ 0x0b, 0xd3, 0x2b, 0xbf, 0xb6, 0x94, 0xdf, 0xd6, 0xef, 0x15, 0xa8, 0x29, 0x17, 0x1a, 0x40, 0x6d,
+ 0x26, 0x4b, 0xf4, 0xea, 0x9a, 0xc5, 0x83, 0x24, 0xf8, 0x3a, 0x12, 0x3d, 0x86, 0x23, 0x89, 0x53,
+ 0x23, 0x54, 0x46, 0x2e, 0x5a, 0xf6, 0xcb, 0x26, 0x26, 0x53, 0x3c, 0x65, 0x84, 0xcf, 0x3d, 0x47,
+ 0x89, 0xa6, 0x7c, 0xc3, 0xdc, 0x55, 0x08, 0x49, 0xd8, 0x9c, 0xc6, 0x5e, 0xb3, 0x18, 0xf2, 0x2a,
+ 0x77, 0xa1, 0x1f, 0x00, 0xe9, 0x82, 0x34, 0x17, 0x62, 0x93, 0x52, 0xef, 0xa4, 0x6d, 0x74, 0x1b,
+ 0x83, 0x4f, 0x1e, 0xa8, 0x4d, 0xe2, 0x0c, 0x36, 0x29, 0xf5, 0x9b, 0xcb, 0xb2, 0x03, 0x21, 0x30,
+ 0x53, 0xc6, 0x62, 0xaf, 0x21, 0x6f, 0x93, 0xeb, 0xb1, 0x69, 0x55, 0x5c, 0xa7, 0xf3, 0x0a, 0x9a,
+ 0xf7, 0xb2, 0x51, 0x07, 0x9e, 0x5e, 0xfc, 0x88, 0x83, 0xd1, 0x24, 0xc0, 0x93, 0x9b, 0xcb, 0x60,
+ 0x84, 0x83, 0x9f, 0xae, 0x47, 0xf8, 0xe6, 0x6a, 0x72, 0x3d, 0x3a, 0xbf, 0xfc, 0xe6, 0x72, 0xf4,
+ 0xd2, 0x7d, 0x84, 0xea, 0x60, 0xbd, 0xb8, 0x09, 0xbe, 0xcf, 0x83, 0x5c, 0x03, 0x59, 0x60, 0x06,
+ 0x2f, 0x26, 0x81, 0x5b, 0xe9, 0xfc, 0x53, 0x81, 0x93, 0x80, 0x64, 0xe2, 0x75, 0xb2, 0x95, 0x67,
+ 0x04, 0x75, 0x41, 0x32, 0x81, 0x6f, 0x93, 0xa2, 0x46, 0xcf, 0x8a, 0x1c, 0x17, 0xe3, 0x0b, 0x96,
+ 0x0f, 0x62, 0xb7, 0x6e, 0x7d, 0x0e, 0xf5, 0x7c, 0x27, 0x5f, 0x8f, 0xde, 0xa4, 0x1c, 0x3d, 0x01,
+ 0xd9, 0x60, 0x98, 0xbe, 0x49, 0xb9, 0x16, 0xc1, 0x12, 0x7a, 0xb3, 0xf5, 0xb7, 0x01, 0xb0, 0x3f,
+ 0xa7, 0x20, 0xb0, 0xf9, 0x9f, 0x05, 0xfe, 0x08, 0x40, 0x91, 0x5f, 0xe8, 0x3e, 0x5b, 0x7a, 0x64,
+ 0xef, 0x7d, 0x07, 0x0d, 0x59, 0xd5, 0x1e, 0x43, 0x45, 0xd6, 0xf5, 0xe9, 0x83, 0x75, 0x6d, 0xd1,
+ 0xfb, 0x92, 0x92, 0xad, 0x35, 0x36, 0xad, 0xaa, 0x6b, 0x76, 0xfe, 0x34, 0xc0, 0xde, 0xd3, 0x76,
+ 0x06, 0xc7, 0x65, 0xc6, 0x8a, 0xaf, 0x7a, 0x7f, 0xaa, 0x66, 0xaa, 0x76, 0xab, 0x58, 0x0a, 0xa1,
+ 0xf6, 0x56, 0xcd, 0xd6, 0xff, 0xa9, 0x79, 0xff, 0xea, 0xe4, 0x48, 0xb1, 0x7d, 0x7b, 0xd7, 0x7b,
+ 0x63, 0xd3, 0x32, 0xdc, 0x8a, 0x04, 0x6b, 0x75, 0x42, 0x68, 0x04, 0x72, 0x0c, 0x9e, 0xf3, 0x48,
+ 0x50, 0x1e, 0x11, 0xf4, 0x0c, 0xea, 0xd3, 0x75, 0x14, 0xcf, 0xb1, 0x1a, 0x8f, 0x2a, 0xfd, 0xe2,
+ 0x91, 0xef, 0x48, 0xaf, 0x0a, 0xce, 0x5f, 0xbf, 0x34, 0x29, 0x57, 0xbc, 0x56, 0xd5, 0xeb, 0xd7,
+ 0xbe, 0x9c, 0xd9, 0xe1, 0x09, 0x38, 0xdb, 0x01, 0xbb, 0x49, 0x69, 0x3e, 0x1b, 0x4f, 0xaf, 0x29,
+ 0x57, 0xf9, 0xb2, 0xd6, 0xc2, 0xc4, 0x45, 0x43, 0x68, 0xea, 0xe0, 0x99, 0xc6, 0x21, 0xa5, 0x72,
+ 0x06, 0xa7, 0x25, 0x1d, 0x8a, 0x40, 0xfd, 0x86, 0x28, 0x03, 0x3f, 0x03, 0x67, 0xdb, 0x6e, 0xb3,
+ 0x45, 0x28, 0x21, 0x39, 0x83, 0xc7, 0xef, 0xea, 0x33, 0xdf, 0x5e, 0x16, 0xa6, 0x8e, 0xa3, 0xf5,
+ 0x91, 0x59, 0x47, 0x6f, 0x65, 0xed, 0x34, 0xf2, 0xed, 0xdb, 0x9d, 0xaa, 0x57, 0xf0, 0xc1, 0x3c,
+ 0xe2, 0x74, 0x26, 0x70, 0xb1, 0x27, 0xe4, 0x09, 0xc7, 0xf2, 0x04, 0xef, 0xd0, 0xfb, 0xf1, 0xdf,
+ 0x57, 0x89, 0x25, 0xa7, 0xec, 0xe1, 0xea, 0xd8, 0xb4, 0x4c, 0xf7, 0x68, 0x6c, 0x5a, 0x35, 0xf7,
+ 0xb8, 0xf3, 0x9b, 0x01, 0xa7, 0xef, 0x26, 0x2b, 0xbf, 0x9f, 0xc2, 0x87, 0x29, 0xe5, 0xf8, 0xd0,
+ 0x1f, 0x4c, 0x3f, 0xb5, 0xe2, 0x90, 0x39, 0xc8, 0xbd, 0x7f, 0x9a, 0x1e, 0xda, 0x1a, 0x7e, 0xf9,
+ 0xf3, 0xf3, 0x90, 0xf5, 0x66, 0x4b, 0xce, 0x92, 0x68, 0x9d, 0xf4, 0x18, 0x0f, 0xfb, 0x5b, 0x83,
+ 0x65, 0xfd, 0x68, 0xb5, 0xe0, 0x44, 0xfd, 0x0c, 0xfb, 0x21, 0xdb, 0xff, 0x58, 0xa7, 0x35, 0xe9,
+ 0x7b, 0xfe, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2d, 0x88, 0xeb, 0xda, 0x6c, 0x07, 0x00, 0x00,
}
diff --git a/src/testplans/generate_test_plan.proto b/src/testplans/generate_test_plan.proto
index 62f170f..a0dfce4 100644
--- a/src/testplans/generate_test_plan.proto
+++ b/src/testplans/generate_test_plan.proto
@@ -36,12 +36,10 @@
// The final test plan.
message GenerateTestPlanResponse {
repeated HwTestUnit hw_test_units = 3;
- repeated MoblabVmTestUnit moblab_vm_test_units = 4;
- repeated TastVmTestUnit tast_vm_test_units = 5;
repeated VmTestUnit vm_test_units = 6;
repeated TastVmTestUnit direct_tast_vm_test_units = 7;
- reserved 2;
+ reserved 2, 4, 5;
}
// The files that should be tested in a test plan.
@@ -76,11 +74,6 @@
HwTestCfg hw_test_cfg = 2;
}
-message MoblabVmTestUnit {
- TestUnitCommon common = 1;
- MoblabVmTestCfg moblab_vm_test_cfg = 2;
-}
-
message TastVmTestUnit {
TestUnitCommon common = 1;
TastVmTestCfg tast_vm_test_cfg = 2;
diff --git a/src/testplans/target_test_requirements_config.proto b/src/testplans/target_test_requirements_config.proto
index 4ea4a91..5b10d8b 100644
--- a/src/testplans/target_test_requirements_config.proto
+++ b/src/testplans/target_test_requirements_config.proto
@@ -63,19 +63,6 @@
repeated HwTest hw_test = 1;
}
-message MoblabVmTestCfg {
- message MoblabTest {
- TestSuiteCommon common = 3;
-
- // Test type to be run.
- string test_type = 1;
-
- reserved 2;
- }
-
- repeated MoblabTest moblab_test = 1;
-}
-
message TastVmTestCfg {
message TastTestExpr {
// A single tast test expression. See https://goo.gl/UPNEgT
@@ -132,12 +119,10 @@
// These configure what testing is needed for these BuildCriteria.
HwTestCfg hw_test_cfg = 3;
- MoblabVmTestCfg moblab_vm_test_cfg = 4;
VmTestCfg vm_test_cfg = 5;
- TastVmTestCfg tast_vm_test_cfg = 6;
TastVmTestCfg direct_tast_vm_test_cfg = 7;
- reserved 2;
+ reserved 2, 4, 6;
}
// A listing of all testing that should be done for all CrOS builds.
