Add offload dir to RunTestRequest
BUG:1022986
Change-Id: I8f71302589b0c837dfa845776b35cde455b289a4
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/proto/+/2125031
Commit-Queue: Jacob Kopczynski <jkop@chromium.org>
Tested-by: Jacob Kopczynski <jkop@chromium.org>
Auto-Submit: Jacob Kopczynski <jkop@chromium.org>
Reviewed-by: Alex Zamorzaev <zamorzaev@chromium.org>
Reviewed-by: Jacob Kopczynski <jkop@chromium.org>
diff --git a/go/test_platform/phosphorus/runtest.pb.go b/go/test_platform/phosphorus/runtest.pb.go
index 2b03836..4d9fcb0 100644
--- a/go/test_platform/phosphorus/runtest.pb.go
+++ b/go/test_platform/phosphorus/runtest.pb.go
@@ -248,9 +248,10 @@
// remote test drive-agnostic environment variables and similar parameters
type RunTestRequest_Environment struct {
- // A directory whose contents will be offloaded as an Isolated output
- // This is impractical for the intended use case and so is stillborn.
- IsolatedOutputDir string `protobuf:"bytes,1,opt,name=isolated_output_dir,json=isolatedOutputDir,proto3" json:"isolated_output_dir,omitempty"` // Deprecated: Do not use.
+ // 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:"-"`
@@ -281,10 +282,9 @@
var xxx_messageInfo_RunTestRequest_Environment proto.InternalMessageInfo
-// Deprecated: Do not use.
-func (m *RunTestRequest_Environment) GetIsolatedOutputDir() string {
+func (m *RunTestRequest_Environment) GetGsRootDir() string {
if m != nil {
- return m.IsolatedOutputDir
+ return m.GsRootDir
}
return ""
}
@@ -356,43 +356,43 @@
}
var fileDescriptor_c8a06e1d821d63d9 = []byte{
- // 602 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xcd, 0x6e, 0xd3, 0x40,
- 0x18, 0x6c, 0x7e, 0x9b, 0x7c, 0x4e, 0x4b, 0xba, 0x80, 0x64, 0x85, 0x43, 0x43, 0xf9, 0x51, 0x4f,
- 0xb6, 0x08, 0x08, 0x55, 0x3d, 0x20, 0x25, 0xb1, 0xab, 0x46, 0x40, 0x83, 0x1c, 0x07, 0x21, 0x2e,
- 0x96, 0x1b, 0x6f, 0x9c, 0x55, 0x6d, 0xaf, 0xd9, 0x9f, 0x4a, 0x79, 0x15, 0x9e, 0x84, 0xc7, 0xe0,
- 0x91, 0xd0, 0xae, 0xe3, 0x36, 0x3d, 0x44, 0x2a, 0xb7, 0xdd, 0xef, 0x9b, 0x99, 0x9d, 0x19, 0x69,
- 0xe1, 0xad, 0xc0, 0x5c, 0x04, 0x79, 0x12, 0x8a, 0x25, 0x65, 0xa9, 0x9d, 0xaf, 0x28, 0xcf, 0x57,
- 0x94, 0x49, 0x6e, 0x33, 0x99, 0xa9, 0x9d, 0x95, 0x33, 0x2a, 0x28, 0x32, 0x1f, 0xe0, 0xac, 0x7b,
- 0x5c, 0xef, 0x38, 0xa6, 0x34, 0x4e, 0xb0, 0xad, 0x71, 0xd7, 0x72, 0x69, 0x0b, 0x92, 0x62, 0x2e,
- 0xc2, 0x34, 0x2f, 0xa8, 0xbd, 0x37, 0x3b, 0x9f, 0x58, 0xd0, 0x34, 0xa5, 0x59, 0x01, 0x3b, 0xf9,
- 0xd3, 0x80, 0x43, 0x4f, 0x66, 0x3e, 0xe6, 0xc2, 0xc3, 0xbf, 0x24, 0xe6, 0x02, 0x9d, 0x41, 0x73,
- 0x41, 0xb3, 0x25, 0x89, 0xcd, 0x4a, 0xbf, 0x72, 0x6a, 0x0c, 0xfa, 0xd6, 0x2e, 0x17, 0xd6, 0x58,
- 0xe3, 0xbc, 0x0d, 0x1e, 0xbd, 0x82, 0x83, 0x48, 0x8a, 0x60, 0x45, 0xb9, 0xc8, 0xc2, 0x14, 0x73,
- 0xb3, 0xda, 0xaf, 0x9d, 0xb6, 0xbd, 0x4e, 0x24, 0xc5, 0x65, 0x39, 0x43, 0x53, 0x68, 0x85, 0x52,
- 0x50, 0xa5, 0x69, 0xd6, 0xf4, 0x03, 0xef, 0x76, 0x3f, 0xf0, 0xd0, 0x9a, 0x35, 0xdc, 0x10, 0x2f,
- 0xf7, 0xbc, 0x3b, 0x11, 0xf4, 0x1d, 0x0c, 0x9c, 0xdd, 0x12, 0x46, 0xb3, 0x14, 0x67, 0xc2, 0xac,
- 0x6b, 0xcd, 0x0f, 0x8f, 0xd6, 0x74, 0xef, 0xb9, 0xde, 0xb6, 0x10, 0xfa, 0x08, 0xad, 0x08, 0x87,
- 0x51, 0x42, 0x32, 0x6c, 0x36, 0xb4, 0x68, 0xcf, 0x2a, 0x5a, 0xb7, 0xca, 0xd6, 0x2d, 0xbf, 0x6c,
- 0xdd, 0xbb, 0xc3, 0xf6, 0x7e, 0x57, 0xa1, 0x55, 0x1a, 0x45, 0x08, 0xea, 0x2a, 0xb6, 0xae, 0xb2,
- 0xed, 0xe9, 0x33, 0x7a, 0x01, 0x6d, 0x6d, 0x2e, 0x64, 0xb1, 0xaa, 0x48, 0x2d, 0x5a, 0x6a, 0x30,
- 0x64, 0x31, 0x47, 0x2f, 0xa1, 0x13, 0x11, 0x9e, 0x27, 0xe1, 0x3a, 0xd0, 0xc4, 0x9a, 0xde, 0x1b,
- 0x9b, 0xd9, 0x95, 0xe2, 0xbf, 0x86, 0x43, 0xc2, 0x83, 0x45, 0x42, 0x70, 0x26, 0x02, 0xdd, 0xa3,
- 0xca, 0xdc, 0xf2, 0x3a, 0x84, 0x8f, 0xf5, 0x50, 0xc5, 0x43, 0x3f, 0x60, 0xff, 0x06, 0xaf, 0x6f,
- 0xc3, 0x84, 0x9b, 0x8d, 0x7e, 0xed, 0xd4, 0x18, 0x7c, 0xfa, 0xef, 0x9a, 0xad, 0xcf, 0x85, 0x80,
- 0x9b, 0x09, 0xb6, 0xf6, 0x4a, 0xb9, 0xde, 0x39, 0x74, 0xb6, 0x17, 0xa8, 0x0b, 0xb5, 0x1b, 0xbc,
- 0xde, 0x44, 0x54, 0x47, 0xf4, 0x0c, 0x1a, 0xb7, 0x61, 0x22, 0xf1, 0x26, 0x5d, 0x71, 0x39, 0xaf,
- 0x9e, 0x55, 0x7a, 0x43, 0x30, 0xb6, 0x0a, 0x47, 0x03, 0x78, 0x4a, 0x38, 0x4d, 0x42, 0x81, 0xa3,
- 0x80, 0x4a, 0x91, 0x4b, 0x11, 0x44, 0x84, 0x15, 0x52, 0xa3, 0xaa, 0x59, 0xf1, 0x8e, 0xca, 0xf5,
- 0x54, 0x6f, 0x1d, 0xc2, 0x46, 0x4d, 0xa8, 0x2b, 0x73, 0x27, 0x7f, 0x2b, 0xf0, 0xe4, 0xce, 0x38,
- 0xcf, 0x69, 0xc6, 0x31, 0x72, 0xa1, 0xc1, 0x45, 0x28, 0x8a, 0xbe, 0x0f, 0x07, 0xf6, 0x23, 0x22,
- 0x17, 0x4c, 0x6b, 0xa6, 0x68, 0x5e, 0xc1, 0x46, 0xc7, 0x60, 0x30, 0xcc, 0x65, 0x22, 0xb8, 0xb6,
- 0x53, 0xa4, 0x80, 0xcd, 0xc8, 0x21, 0xec, 0x64, 0x0e, 0x0d, 0x4d, 0x40, 0xcf, 0xe1, 0x68, 0xe6,
- 0x0f, 0x7d, 0x37, 0x98, 0x5f, 0xcd, 0xbe, 0xb9, 0xe3, 0xc9, 0xc5, 0xc4, 0x75, 0xba, 0x7b, 0xe8,
- 0x00, 0xda, 0xb3, 0xf9, 0x78, 0xec, 0xba, 0x8e, 0xeb, 0x74, 0x2b, 0x08, 0xa0, 0x79, 0x31, 0x9c,
- 0x7c, 0x71, 0x9d, 0x6e, 0x55, 0xad, 0xfc, 0xc9, 0x57, 0xd7, 0x09, 0xa6, 0x73, 0xbf, 0x5b, 0x43,
- 0x06, 0xec, 0x0f, 0x47, 0x53, 0xcf, 0x77, 0x9d, 0x6e, 0x7d, 0xe4, 0xfc, 0x1c, 0xc5, 0xd4, 0x5a,
- 0xac, 0x18, 0x4d, 0x89, 0x4c, 0x2d, 0xca, 0x62, 0xbb, 0xbc, 0x50, 0x6e, 0x93, 0x6c, 0xc9, 0xc2,
- 0xe2, 0xc7, 0xdb, 0x31, 0xb5, 0x77, 0x7d, 0xf0, 0xeb, 0xa6, 0x86, 0xbc, 0xff, 0x17, 0x00, 0x00,
- 0xff, 0xff, 0x6a, 0x43, 0x72, 0xd6, 0x66, 0x04, 0x00, 0x00,
+ // 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,
}
diff --git a/src/test_platform/phosphorus/runtest.proto b/src/test_platform/phosphorus/runtest.proto
index 2fd1fa6..a7c2900 100644
--- a/src/test_platform/phosphorus/runtest.proto
+++ b/src/test_platform/phosphorus/runtest.proto
@@ -44,9 +44,12 @@
// remote test drive-agnostic environment variables and similar parameters
message Environment {
- // A directory whose contents will be offloaded as an Isolated output
- // This is impractical for the intended use case and so is stillborn.
- string isolated_output_dir = 1 [deprecated=true];
+ 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;
@@ -85,4 +88,4 @@
// Absolute path to the test results directory created by `runtest`.
// Must be inside config.task.results_dir (the overall results directory).
string results_dir = 2;
-}
\ No newline at end of file
+}
