test_platform: Drop deprecated field from phosphorus API
BUG=None
TEST=./generate.sh
Change-Id: I04ba3dfc6053bd1ff72f5f65e2e3382e1ffb8064
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/proto/+/2567711
Auto-Submit: Prathmesh Prabhu <pprabhu@google.com>
Commit-Queue: Sean Abraham <seanabraham@chromium.org>
Reviewed-by: Sean Abraham <seanabraham@chromium.org>
diff --git a/go/test_platform/phosphorus/runtest.pb.go b/go/test_platform/phosphorus/runtest.pb.go
index 4d9fcb0..cb46890 100644
--- a/go/test_platform/phosphorus/runtest.pb.go
+++ b/go/test_platform/phosphorus/runtest.pb.go
@@ -72,8 +72,7 @@
DutHostnames []string `protobuf:"bytes,2,rep,name=dut_hostnames,json=dutHostnames,proto3" json:"dut_hostnames,omitempty"`
// Types that are valid to be assigned to Test:
// *RunTestRequest_Autotest_
- Test isRunTestRequest_Test `protobuf_oneof:"test"`
- Environment *RunTestRequest_Environment `protobuf:"bytes,4,opt,name=environment,proto3" json:"environment,omitempty"`
+ Test isRunTestRequest_Test `protobuf_oneof:"test"`
// Hard deadline for execution.
//
// All test execution should abort beyond this deadline.
@@ -146,13 +145,6 @@
return nil
}
-func (m *RunTestRequest) GetEnvironment() *RunTestRequest_Environment {
- if m != nil {
- return m.Environment
- }
- return nil
-}
-
func (m *RunTestRequest) GetDeadline() *timestamp.Timestamp {
if m != nil {
return m.Deadline
@@ -246,49 +238,6 @@
return nil
}
-// remote test drive-agnostic environment variables and similar parameters
-type RunTestRequest_Environment struct {
- // Directory in Google Storage (bucket or subdirectory) in which
- // synchronous log-data will be offloaded. Reused across tasks.
- // ex. "gs://chromeos-autotest-results/sync-offloads-testing"
- GsRootDir string `protobuf:"bytes,2,opt,name=gs_root_dir,json=gsRootDir,proto3" json:"gs_root_dir,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
-}
-
-func (m *RunTestRequest_Environment) Reset() { *m = RunTestRequest_Environment{} }
-func (m *RunTestRequest_Environment) String() string { return proto.CompactTextString(m) }
-func (*RunTestRequest_Environment) ProtoMessage() {}
-func (*RunTestRequest_Environment) Descriptor() ([]byte, []int) {
- return fileDescriptor_c8a06e1d821d63d9, []int{0, 1}
-}
-
-func (m *RunTestRequest_Environment) XXX_Unmarshal(b []byte) error {
- return xxx_messageInfo_RunTestRequest_Environment.Unmarshal(m, b)
-}
-func (m *RunTestRequest_Environment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
- return xxx_messageInfo_RunTestRequest_Environment.Marshal(b, m, deterministic)
-}
-func (m *RunTestRequest_Environment) XXX_Merge(src proto.Message) {
- xxx_messageInfo_RunTestRequest_Environment.Merge(m, src)
-}
-func (m *RunTestRequest_Environment) XXX_Size() int {
- return xxx_messageInfo_RunTestRequest_Environment.Size(m)
-}
-func (m *RunTestRequest_Environment) XXX_DiscardUnknown() {
- xxx_messageInfo_RunTestRequest_Environment.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_RunTestRequest_Environment proto.InternalMessageInfo
-
-func (m *RunTestRequest_Environment) GetGsRootDir() string {
- if m != nil {
- return m.GsRootDir
- }
- return ""
-}
-
// RunTestResponse defines the output of `phosphorus runtest`.
type RunTestResponse struct {
// `phosphorus runtest` exits with exit code 0 unless there is an
@@ -347,7 +296,6 @@
proto.RegisterType((*RunTestRequest)(nil), "test_platform.phosphorus.RunTestRequest")
proto.RegisterType((*RunTestRequest_Autotest)(nil), "test_platform.phosphorus.RunTestRequest.Autotest")
proto.RegisterMapType((map[string]string)(nil), "test_platform.phosphorus.RunTestRequest.Autotest.KeyvalsEntry")
- proto.RegisterType((*RunTestRequest_Environment)(nil), "test_platform.phosphorus.RunTestRequest.Environment")
proto.RegisterType((*RunTestResponse)(nil), "test_platform.phosphorus.RunTestResponse")
}
@@ -356,43 +304,41 @@
}
var fileDescriptor_c8a06e1d821d63d9 = []byte{
- // 598 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x5d, 0x6b, 0xdb, 0x3c,
- 0x18, 0x6d, 0x3e, 0x9b, 0x3c, 0x4e, 0xfb, 0xe6, 0x15, 0x1b, 0x98, 0x0c, 0xd6, 0xac, 0xfb, 0xa0,
- 0x57, 0x36, 0x6b, 0xc7, 0x28, 0xbd, 0x18, 0x24, 0xb1, 0x4b, 0xb3, 0x8f, 0x76, 0x28, 0xce, 0x18,
- 0xbb, 0x31, 0x6e, 0xa2, 0x38, 0xa2, 0xb6, 0xe4, 0x49, 0x72, 0x21, 0x7f, 0x65, 0x3f, 0x61, 0xbf,
- 0x66, 0x3f, 0x69, 0x48, 0x76, 0xda, 0xf4, 0x22, 0xd0, 0xdd, 0x49, 0xcf, 0x73, 0xce, 0xd1, 0x39,
- 0x07, 0x04, 0x6f, 0x14, 0x91, 0x2a, 0xcc, 0x92, 0x48, 0x2d, 0xb8, 0x48, 0xdd, 0x6c, 0xc9, 0x65,
- 0xb6, 0xe4, 0x22, 0x97, 0xae, 0xc8, 0x99, 0xde, 0x39, 0x99, 0xe0, 0x8a, 0x23, 0xfb, 0x01, 0xce,
- 0xb9, 0xc7, 0xf5, 0x0e, 0x62, 0xce, 0xe3, 0x84, 0xb8, 0x06, 0x77, 0x9d, 0x2f, 0x5c, 0x45, 0x53,
- 0x22, 0x55, 0x94, 0x66, 0x05, 0xb5, 0xf7, 0x7a, 0xeb, 0x13, 0x33, 0x9e, 0xa6, 0x9c, 0x15, 0xb0,
- 0xc3, 0xdf, 0x0d, 0xd8, 0xc7, 0x39, 0x0b, 0x88, 0x54, 0x98, 0xfc, 0xcc, 0x89, 0x54, 0xe8, 0x14,
- 0x9a, 0x33, 0xce, 0x16, 0x34, 0xb6, 0x2b, 0xfd, 0xca, 0x91, 0x75, 0xdc, 0x77, 0xb6, 0xb9, 0x70,
- 0x46, 0x06, 0x87, 0x4b, 0x3c, 0x7a, 0x09, 0x7b, 0xf3, 0x5c, 0x85, 0x4b, 0x2e, 0x15, 0x8b, 0x52,
- 0x22, 0xed, 0x6a, 0xbf, 0x76, 0xd4, 0xc6, 0x9d, 0x79, 0xae, 0x2e, 0xd6, 0x33, 0x74, 0x05, 0xad,
- 0x28, 0x57, 0x5c, 0x6b, 0xda, 0x35, 0xf3, 0xc0, 0xdb, 0xed, 0x0f, 0x3c, 0xb4, 0xe6, 0x0c, 0x4a,
- 0xe2, 0xc5, 0x0e, 0xbe, 0x13, 0x41, 0xdf, 0xc0, 0x22, 0xec, 0x96, 0x0a, 0xce, 0x52, 0xc2, 0x94,
- 0x5d, 0x37, 0x9a, 0xef, 0x1e, 0xad, 0xe9, 0xdf, 0x73, 0xf1, 0xa6, 0x10, 0x7a, 0x0f, 0xad, 0x39,
- 0x89, 0xe6, 0x09, 0x65, 0xc4, 0x6e, 0x18, 0xd1, 0x9e, 0x53, 0xb4, 0xee, 0xac, 0x5b, 0x77, 0x82,
- 0x75, 0xeb, 0xf8, 0x0e, 0xdb, 0xfb, 0x55, 0x85, 0xd6, 0xda, 0x28, 0x42, 0x50, 0xd7, 0xb1, 0x4d,
- 0x95, 0x6d, 0x6c, 0xce, 0xe8, 0x19, 0xb4, 0x8d, 0xb9, 0x48, 0xc4, 0xba, 0x22, 0xbd, 0x68, 0xe9,
- 0xc1, 0x40, 0xc4, 0x12, 0xbd, 0x80, 0xce, 0x9c, 0xca, 0x2c, 0x89, 0x56, 0xa1, 0x21, 0xd6, 0xcc,
- 0xde, 0x2a, 0x67, 0x97, 0x9a, 0xff, 0x0a, 0xf6, 0xa9, 0x0c, 0x67, 0x09, 0x25, 0x4c, 0x85, 0xa6,
- 0x47, 0x9d, 0xb9, 0x85, 0x3b, 0x54, 0x8e, 0xcc, 0x50, 0xc7, 0x43, 0xdf, 0x61, 0xf7, 0x86, 0xac,
- 0x6e, 0xa3, 0x44, 0xda, 0x8d, 0x7e, 0xed, 0xc8, 0x3a, 0xfe, 0xf0, 0xcf, 0x35, 0x3b, 0x9f, 0x0a,
- 0x01, 0x9f, 0x29, 0xb1, 0xc2, 0x6b, 0xb9, 0xde, 0x19, 0x74, 0x36, 0x17, 0xa8, 0x0b, 0xb5, 0x1b,
- 0xb2, 0x2a, 0x23, 0xea, 0x23, 0x7a, 0x02, 0x8d, 0xdb, 0x28, 0xc9, 0x49, 0x99, 0xae, 0xb8, 0x9c,
- 0x55, 0x4f, 0x2b, 0xbd, 0x13, 0xb0, 0x36, 0x0a, 0x47, 0xcf, 0xc1, 0x8a, 0x65, 0x28, 0x38, 0x57,
- 0xe1, 0x9c, 0x8a, 0x12, 0xde, 0x8e, 0x25, 0xe6, 0x5c, 0x79, 0x54, 0x7c, 0xac, 0xb7, 0x2a, 0xdd,
- 0xea, 0xb0, 0x09, 0x75, 0x6d, 0xe7, 0xf0, 0x4f, 0x05, 0xfe, 0xbb, 0xb3, 0x2a, 0x33, 0xce, 0x24,
- 0x41, 0x3e, 0x34, 0xa4, 0x8a, 0x54, 0xd1, 0xf0, 0xfe, 0xb1, 0xfb, 0x88, 0x90, 0x05, 0xd3, 0x99,
- 0x68, 0x1a, 0x2e, 0xd8, 0xe8, 0x00, 0x2c, 0x41, 0x64, 0x9e, 0x28, 0xb9, 0x61, 0x04, 0xca, 0x91,
- 0x47, 0xc5, 0xe1, 0x14, 0x1a, 0x86, 0x80, 0x9e, 0xc2, 0xff, 0x93, 0x60, 0x10, 0xf8, 0xe1, 0xf4,
- 0x72, 0xf2, 0xd5, 0x1f, 0x8d, 0xcf, 0xc7, 0xbe, 0xd7, 0xdd, 0x41, 0x7b, 0xd0, 0x9e, 0x4c, 0x47,
- 0x23, 0xdf, 0xf7, 0x7c, 0xaf, 0x5b, 0x41, 0x00, 0xcd, 0xf3, 0xc1, 0xf8, 0xb3, 0xef, 0x75, 0xab,
- 0x7a, 0x15, 0x8c, 0xbf, 0xf8, 0x5e, 0x78, 0x35, 0x0d, 0xba, 0x35, 0x64, 0xc1, 0xee, 0x60, 0x78,
- 0x85, 0x03, 0xdf, 0xeb, 0xd6, 0x87, 0xde, 0x8f, 0x61, 0xcc, 0x9d, 0xd9, 0x52, 0xf0, 0x94, 0xe6,
- 0xa9, 0xc3, 0x45, 0xec, 0xae, 0x2f, 0x5c, 0xba, 0x94, 0x2d, 0x44, 0x54, 0xfc, 0x71, 0x37, 0xe6,
- 0xee, 0xb6, 0x2f, 0x7d, 0xdd, 0x34, 0x90, 0x93, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4d, 0x43,
- 0x72, 0x8a, 0x58, 0x04, 0x00, 0x00,
+ // 562 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xdd, 0x6e, 0xda, 0x30,
+ 0x18, 0x2d, 0x10, 0x28, 0x7c, 0xd0, 0x2e, 0xb3, 0x36, 0x09, 0xb1, 0x8b, 0xb2, 0xee, 0x47, 0x5c,
+ 0x25, 0x5a, 0x27, 0x4d, 0x55, 0x2f, 0x26, 0x01, 0x49, 0x55, 0xf6, 0xd3, 0x4e, 0x26, 0x48, 0xd3,
+ 0x6e, 0xa2, 0x14, 0x4c, 0xb0, 0x9a, 0xd8, 0x99, 0xed, 0x54, 0xe2, 0x55, 0xf6, 0x14, 0x7b, 0x94,
+ 0x3d, 0xd2, 0x64, 0x27, 0x61, 0xeb, 0x05, 0xd2, 0x76, 0x67, 0x7f, 0xdf, 0x39, 0xc7, 0xe7, 0x1c,
+ 0xc9, 0xf0, 0x5a, 0x11, 0xa9, 0xc2, 0x2c, 0x89, 0xd4, 0x9a, 0x8b, 0xd4, 0xcd, 0x36, 0x5c, 0x66,
+ 0x1b, 0x2e, 0x72, 0xe9, 0x8a, 0x9c, 0xe9, 0x9d, 0x93, 0x09, 0xae, 0x38, 0xea, 0x3f, 0xc0, 0x39,
+ 0x7f, 0x70, 0x83, 0x93, 0x98, 0xf3, 0x38, 0x21, 0xae, 0xc1, 0xdd, 0xe6, 0x6b, 0x57, 0xd1, 0x94,
+ 0x48, 0x15, 0xa5, 0x59, 0x41, 0x1d, 0xbc, 0xda, 0xfb, 0xc4, 0x92, 0xa7, 0x29, 0x67, 0x05, 0xec,
+ 0xf4, 0xa7, 0x05, 0xc7, 0x38, 0x67, 0x01, 0x91, 0x0a, 0x93, 0xef, 0x39, 0x91, 0x0a, 0x9d, 0x43,
+ 0x6b, 0xc9, 0xd9, 0x9a, 0xc6, 0xfd, 0xda, 0xb0, 0x36, 0xea, 0x9e, 0x0d, 0x9d, 0x7d, 0x2e, 0x9c,
+ 0xa9, 0xc1, 0xe1, 0x12, 0x8f, 0x5e, 0xc0, 0xd1, 0x2a, 0x57, 0xe1, 0x86, 0x4b, 0xc5, 0xa2, 0x94,
+ 0xc8, 0x7e, 0x7d, 0xd8, 0x18, 0x75, 0x70, 0x6f, 0x95, 0xab, 0xab, 0x6a, 0x86, 0x6e, 0xa0, 0x1d,
+ 0xe5, 0x8a, 0x6b, 0xcd, 0x7e, 0xc3, 0x3c, 0xf0, 0x66, 0xff, 0x03, 0x0f, 0xad, 0x39, 0xe3, 0x92,
+ 0x78, 0x75, 0x80, 0x77, 0x22, 0xe8, 0x1d, 0xb4, 0x57, 0x24, 0x5a, 0x25, 0x94, 0x91, 0x7e, 0xd3,
+ 0x08, 0x0e, 0x9c, 0xa2, 0x1d, 0xa7, 0x6a, 0xc7, 0x09, 0xaa, 0x76, 0xf0, 0x0e, 0x3b, 0xf8, 0x51,
+ 0x87, 0x76, 0x25, 0x88, 0x10, 0x58, 0xda, 0x9e, 0x89, 0xdc, 0xc1, 0xe6, 0x8c, 0x9e, 0x41, 0xc7,
+ 0x18, 0x8b, 0x44, 0xac, 0xa3, 0xe8, 0x45, 0x5b, 0x0f, 0xc6, 0x22, 0x96, 0xe8, 0x39, 0xf4, 0x56,
+ 0x54, 0x66, 0x49, 0xb4, 0x0d, 0x0d, 0xb1, 0x61, 0xf6, 0xdd, 0x72, 0x76, 0xad, 0xf9, 0x2f, 0xe1,
+ 0x98, 0xca, 0x70, 0x99, 0x50, 0xc2, 0x54, 0x68, 0xf2, 0x5a, 0xc3, 0xda, 0xa8, 0x8d, 0x7b, 0x54,
+ 0x4e, 0xcd, 0x50, 0x47, 0x43, 0x5f, 0xe1, 0xf0, 0x8e, 0x6c, 0xef, 0xa3, 0x44, 0xf6, 0x9b, 0xc3,
+ 0xc6, 0xa8, 0x7b, 0xf6, 0xfe, 0xbf, 0xeb, 0x70, 0x3e, 0x16, 0x02, 0x3e, 0x53, 0x62, 0x8b, 0x2b,
+ 0xb9, 0xc1, 0x05, 0xf4, 0xfe, 0x5e, 0x20, 0x1b, 0x1a, 0x77, 0x64, 0x5b, 0x46, 0xd4, 0x47, 0xf4,
+ 0x04, 0x9a, 0xf7, 0x51, 0x92, 0x93, 0x32, 0x5d, 0x71, 0xb9, 0xa8, 0x9f, 0xd7, 0x26, 0x2d, 0xb0,
+ 0xb4, 0xf2, 0x07, 0xab, 0x6d, 0xd9, 0x4d, 0xdc, 0x25, 0xec, 0x9e, 0x0a, 0xce, 0x52, 0xc2, 0xd4,
+ 0xe9, 0xaf, 0x1a, 0x3c, 0xda, 0x19, 0x91, 0x19, 0x67, 0x92, 0x20, 0x1f, 0x9a, 0x52, 0x45, 0xaa,
+ 0xe8, 0xef, 0xf8, 0xcc, 0xfd, 0x87, 0x08, 0x05, 0xd3, 0x99, 0x6b, 0x1a, 0x2e, 0xd8, 0xe8, 0x04,
+ 0xba, 0x82, 0xc8, 0x3c, 0x51, 0x32, 0x5c, 0x51, 0x51, 0xba, 0x82, 0x72, 0xe4, 0x51, 0x71, 0xba,
+ 0x80, 0xa6, 0x21, 0xa0, 0xa7, 0xf0, 0x78, 0x1e, 0x8c, 0x03, 0x3f, 0x5c, 0x5c, 0xcf, 0xbf, 0xf8,
+ 0xd3, 0xd9, 0xe5, 0xcc, 0xf7, 0xec, 0x03, 0x74, 0x04, 0x9d, 0xf9, 0x62, 0x3a, 0xf5, 0x7d, 0xcf,
+ 0xf7, 0xec, 0x1a, 0x02, 0x68, 0x5d, 0x8e, 0x67, 0x9f, 0x7c, 0xcf, 0xae, 0xeb, 0x55, 0x30, 0xfb,
+ 0xec, 0x7b, 0xe1, 0xcd, 0x22, 0xb0, 0x1b, 0xa8, 0x0b, 0x87, 0xe3, 0xc9, 0x0d, 0x0e, 0x7c, 0xcf,
+ 0xb6, 0x26, 0xde, 0xb7, 0x49, 0xcc, 0x9d, 0xe5, 0x46, 0xf0, 0x94, 0xe6, 0xa9, 0xc3, 0x45, 0xec,
+ 0x56, 0x17, 0x2e, 0x5d, 0xca, 0xd6, 0x22, 0x2a, 0x7e, 0x9a, 0x1b, 0x73, 0x77, 0xdf, 0xc7, 0xba,
+ 0x6d, 0x19, 0xc8, 0xdb, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd3, 0x69, 0x9f, 0xc7, 0xde, 0x03,
+ 0x00, 0x00,
}
diff --git a/src/test_platform/phosphorus/runtest.proto b/src/test_platform/phosphorus/runtest.proto
index a7c2900..bc5d0f1 100644
--- a/src/test_platform/phosphorus/runtest.proto
+++ b/src/test_platform/phosphorus/runtest.proto
@@ -42,22 +42,13 @@
Autotest autotest = 3;
}
- // remote test drive-agnostic environment variables and similar parameters
- message Environment {
- reserved 1; // formerly isolated output dir
-
- // Directory in Google Storage (bucket or subdirectory) in which
- // synchronous log-data will be offloaded. Reused across tasks.
- // ex. "gs://chromeos-autotest-results/sync-offloads-testing"
- string gs_root_dir = 2;
- }
-
- Environment environment = 4;
-
// Hard deadline for execution.
//
// All test execution should abort beyond this deadline.
google.protobuf.Timestamp deadline = 5;
+
+ reserved 4;
+ reserved "environment";
}
// RunTestResponse defines the output of `phosphorus runtest`.
