remote_test_driver: temporarily drop chromiumos/config dep
This dependency makes it impossible to run compile_build_api_proto
inside the chromite api dir, since there's no binding in there
currently for the chromiumos/config proto repo.
BUG=1151028
TEST=generate
Change-Id: Ie2728332a5a937da3c5d8df05192e6981fd5bd9e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/proto/+/2611790
Auto-Submit: Sean Abraham <seanabraham@chromium.org>
Reviewed-by: Prathmesh Prabhu <pprabhu@google.com>
Commit-Queue: Prathmesh Prabhu <pprabhu@google.com>
diff --git a/go/chromite/api/remote_test_driver.pb.go b/go/chromite/api/remote_test_driver.pb.go
index 7878723..5c215bd 100644
--- a/go/chromite/api/remote_test_driver.pb.go
+++ b/go/chromite/api/remote_test_driver.pb.go
@@ -7,7 +7,6 @@
context "context"
fmt "fmt"
proto "github.com/golang/protobuf/proto"
- v1 "go.chromium.org/chromiumos/config/go/api/test/metadata/v1"
chromiumos "go.chromium.org/chromiumos/infra/proto/go/chromiumos"
grpc "google.golang.org/grpc"
codes "google.golang.org/grpc/codes"
@@ -119,12 +118,10 @@
// the Remote Test Driver. This folder will contain a Dockerfile in addition
// to test harness(es) and content. It will be such that `gcloud builds
// submit` can be invoked in the directory.
- BuildContext *chromiumos.Path `protobuf:"bytes,1,opt,name=build_context,json=buildContext,proto3" json:"build_context,omitempty"`
- // Metadata about the RTD.
- Specifications []*v1.Specification `protobuf:"bytes,2,rep,name=specifications,proto3" json:"specifications,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
+ BuildContext *chromiumos.Path `protobuf:"bytes,1,opt,name=build_context,json=buildContext,proto3" json:"build_context,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
}
func (m *RemoteTestDriver) Reset() { *m = RemoteTestDriver{} }
@@ -159,13 +156,6 @@
return nil
}
-func (m *RemoteTestDriver) GetSpecifications() []*v1.Specification {
- if m != nil {
- return m.Specifications
- }
- return nil
-}
-
func init() {
proto.RegisterType((*AssembleRequest)(nil), "chromite.api.AssembleRequest")
proto.RegisterType((*AssembleResponse)(nil), "chromite.api.AssembleResponse")
@@ -177,32 +167,28 @@
}
var fileDescriptor_5784d7f92f93aadf = []byte{
- // 394 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xcf, 0xca, 0xd3, 0x40,
- 0x14, 0xc5, 0xc9, 0x27, 0x7c, 0xe8, 0xb4, 0x6a, 0x1c, 0xa1, 0x0d, 0x41, 0x4b, 0x29, 0x08, 0xc5,
- 0xc5, 0x0c, 0xad, 0x44, 0xdc, 0x6a, 0xbb, 0x71, 0x23, 0x92, 0xba, 0x12, 0x24, 0x4c, 0x92, 0xdb,
- 0x74, 0xa0, 0xc9, 0xc4, 0x99, 0x9b, 0xe0, 0xd2, 0xc7, 0xf1, 0x39, 0x7c, 0x1f, 0xdf, 0x41, 0x3a,
- 0xd3, 0x3f, 0x69, 0xca, 0xb7, 0x0b, 0x73, 0x7e, 0x67, 0xe6, 0xdc, 0x93, 0x4b, 0xde, 0x64, 0x3b,
- 0xad, 0x4a, 0x89, 0xc0, 0x45, 0x2d, 0xb9, 0x86, 0x52, 0x21, 0x24, 0x08, 0x06, 0x93, 0x5c, 0xcb,
- 0x16, 0x34, 0xab, 0xb5, 0x42, 0x45, 0x87, 0x27, 0x8c, 0x89, 0x5a, 0x86, 0xaf, 0xae, 0x4c, 0x69,
- 0x23, 0xf7, 0x79, 0x22, 0x6a, 0xe9, 0xd8, 0x70, 0xec, 0xd4, 0xa6, 0x54, 0x86, 0x67, 0xaa, 0x2c,
- 0x55, 0x75, 0x14, 0xa2, 0x2b, 0xa1, 0xda, 0xca, 0xc2, 0xfa, 0x0f, 0xaf, 0xf1, 0x12, 0x50, 0xe4,
- 0x02, 0x05, 0x6f, 0x17, 0xe7, 0x6f, 0x67, 0x9b, 0x21, 0x79, 0xfe, 0xd1, 0x18, 0x28, 0xd3, 0x3d,
- 0xc4, 0xf0, 0xb3, 0x01, 0x83, 0xf4, 0x2d, 0xb9, 0x3f, 0xdc, 0xa5, 0x30, 0xf0, 0xa6, 0xde, 0x7c,
- 0xb0, 0xa4, 0xec, 0x72, 0x35, 0x5b, 0x59, 0x25, 0x3e, 0x12, 0x34, 0x22, 0x04, 0x85, 0x2e, 0x00,
- 0x93, 0x5c, 0xea, 0xe0, 0xce, 0xf2, 0xa3, 0x2e, 0x1f, 0x83, 0x69, 0xf6, 0xf8, 0x55, 0xe0, 0x2e,
- 0x7e, 0xe2, 0xc8, 0xb5, 0xd4, 0xb3, 0x94, 0xf8, 0x97, 0x57, 0x4d, 0xad, 0x2a, 0x03, 0xf4, 0x0b,
- 0x79, 0x79, 0xdb, 0x90, 0x09, 0xbc, 0xe9, 0xa3, 0xf9, 0x60, 0x39, 0x61, 0xdd, 0x8e, 0x58, 0x6c,
- 0xc1, 0x6f, 0x60, 0x70, 0x6d, 0xb1, 0xf8, 0x85, 0xee, 0x9d, 0x98, 0xd9, 0x1f, 0x8f, 0xf8, 0x7d,
- 0x8e, 0x46, 0xe4, 0xa9, 0x6b, 0x34, 0x53, 0x15, 0xc2, 0xaf, 0xd3, 0x88, 0x7e, 0x37, 0xb2, 0x0d,
- 0x3b, 0xb4, 0xd8, 0xca, 0x51, 0xf4, 0x07, 0x79, 0x66, 0x6a, 0xc8, 0xe4, 0x56, 0x66, 0x02, 0xa5,
- 0xaa, 0x4c, 0x70, 0x67, 0x63, 0x45, 0x5d, 0x9f, 0x6b, 0xdd, 0xe6, 0x3b, 0x4c, 0xc0, 0xce, 0x4d,
- 0xb7, 0x0b, 0xb6, 0xe9, 0xba, 0xe3, 0xde, 0x65, 0xcb, 0xdf, 0x1e, 0x19, 0xf7, 0xa3, 0x6e, 0x40,
- 0xb7, 0x32, 0x03, 0xfa, 0x99, 0x3c, 0x3e, 0x55, 0x45, 0x5f, 0x5f, 0xb7, 0xd0, 0xfb, 0x71, 0xe1,
- 0xe4, 0x21, 0xd9, 0x35, 0x1c, 0x86, 0x7f, 0xff, 0x85, 0x23, 0x42, 0x6f, 0x5b, 0xf6, 0xbd, 0x4f,
- 0x1f, 0xbe, 0xbf, 0x2f, 0xd4, 0x79, 0x1a, 0xa6, 0x74, 0xc1, 0x3b, 0x0b, 0x25, 0xab, 0xad, 0x16,
- 0xdc, 0x6e, 0x0c, 0x2f, 0x14, 0xef, 0x6e, 0x68, 0x7a, 0x6f, 0x8f, 0xdf, 0xfd, 0x0f, 0x00, 0x00,
- 0xff, 0xff, 0x5f, 0xc8, 0xcb, 0x2c, 0xed, 0x02, 0x00, 0x00,
+ // 332 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0x41, 0x4b, 0xeb, 0x40,
+ 0x14, 0x85, 0xc9, 0x7b, 0x50, 0xde, 0x9b, 0xf6, 0xf1, 0xe2, 0x08, 0x6d, 0x09, 0x5a, 0x4a, 0x41,
+ 0x28, 0x2e, 0x66, 0xa0, 0x52, 0x71, 0xab, 0xed, 0xa6, 0x1b, 0x91, 0xe8, 0xca, 0x4d, 0x48, 0xd2,
+ 0x6b, 0x3a, 0xd0, 0xe4, 0xc6, 0x99, 0x9b, 0xe2, 0xd2, 0xdf, 0xe6, 0xff, 0xf1, 0x3f, 0x88, 0x33,
+ 0xd6, 0xa6, 0x29, 0x6e, 0xef, 0xf9, 0x6e, 0x72, 0xce, 0xb9, 0xc3, 0xce, 0xd2, 0x95, 0xc6, 0x5c,
+ 0x11, 0xc8, 0xb8, 0x54, 0x52, 0x43, 0x8e, 0x04, 0x11, 0x81, 0xa1, 0x68, 0xa9, 0xd5, 0x06, 0xb4,
+ 0x28, 0x35, 0x12, 0xf2, 0xce, 0x16, 0x13, 0x71, 0xa9, 0x82, 0x93, 0xbd, 0xa5, 0xa4, 0x52, 0xeb,
+ 0x65, 0x14, 0x97, 0xca, 0xb1, 0x41, 0xcf, 0xa9, 0x55, 0x8e, 0x46, 0xa6, 0x98, 0xe7, 0x58, 0x38,
+ 0x61, 0x44, 0xec, 0xff, 0xb5, 0x31, 0x90, 0x27, 0x6b, 0x08, 0xe1, 0xb9, 0x02, 0x43, 0xfc, 0x9c,
+ 0xb5, 0x3e, 0x69, 0xa4, 0xbe, 0x37, 0xf4, 0xc6, 0xed, 0x09, 0x17, 0xbb, 0x65, 0x31, 0xb3, 0x4a,
+ 0xf8, 0x45, 0xf0, 0x29, 0x63, 0x14, 0xeb, 0x0c, 0x28, 0x5a, 0x2a, 0xdd, 0xff, 0x65, 0xf9, 0x6e,
+ 0x9d, 0x0f, 0xc1, 0x54, 0x6b, 0xba, 0x8b, 0x69, 0x15, 0xfe, 0x75, 0xe4, 0x5c, 0xe9, 0x51, 0xc2,
+ 0xfc, 0xdd, 0x5f, 0x4d, 0x89, 0x85, 0x01, 0x7e, 0xcb, 0x8e, 0x0f, 0xa3, 0x9a, 0xbe, 0x37, 0xfc,
+ 0x3d, 0x6e, 0x4f, 0x06, 0xa2, 0x1e, 0x56, 0x84, 0x16, 0x7c, 0x00, 0x43, 0x73, 0x8b, 0x85, 0x47,
+ 0xba, 0x31, 0x31, 0xa3, 0x05, 0xf3, 0x9b, 0x18, 0x9f, 0xb2, 0x7f, 0xae, 0x99, 0x14, 0x0b, 0x82,
+ 0x97, 0x6d, 0x42, 0xbf, 0xee, 0xd8, 0x7a, 0xed, 0x58, 0x6c, 0xe6, 0xa8, 0xc9, 0xab, 0xc7, 0x7a,
+ 0xcd, 0x6f, 0xdd, 0x83, 0xde, 0xa8, 0x14, 0xf8, 0x82, 0xfd, 0xd9, 0x46, 0xe1, 0xa7, 0xfb, 0x2e,
+ 0x1b, 0xc5, 0x06, 0x83, 0x9f, 0x64, 0xd7, 0x40, 0x10, 0xbc, 0xbd, 0x07, 0x5d, 0xc6, 0x0f, 0x5b,
+ 0xf0, 0xbd, 0x9b, 0xab, 0xc7, 0xcb, 0x0c, 0xbf, 0x6d, 0x0a, 0xd4, 0x99, 0xac, 0x9d, 0x54, 0x15,
+ 0x4f, 0x3a, 0x96, 0xf6, 0xa2, 0x32, 0x43, 0x59, 0x7f, 0x0a, 0x49, 0xcb, 0x8e, 0x2f, 0x3e, 0x02,
+ 0x00, 0x00, 0xff, 0xff, 0xb9, 0xb1, 0x19, 0x2d, 0x56, 0x02, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
diff --git a/src/chromite/api/remote_test_driver.proto b/src/chromite/api/remote_test_driver.proto
index 454435f..d5257d6 100644
--- a/src/chromite/api/remote_test_driver.proto
+++ b/src/chromite/api/remote_test_driver.proto
@@ -6,7 +6,8 @@
import "chromite/api/build_api.proto";
import "chromiumos/common.proto";
-import "chromiumos/config/api/test/metadata/v1/metadata.proto";
+// TODO(https://crbug.com/1151028): fix dependency for chromite protoc
+// import "chromiumos/config/api/test/metadata/v1/metadata.proto";
message AssembleRequest {
// The chroot used to execute the endpoint.
@@ -27,7 +28,8 @@
// submit` can be invoked in the directory.
chromiumos.Path build_context = 1;
// Metadata about the RTD.
- repeated chromiumos.config.api.test.metadata.v1.Specification specifications = 2;
+ // TODO(https://crbug.com/1151028): fix dependency for chromite protoc
+ // repeated chromiumos.config.api.test.metadata.v1.Specification specifications = 2;
}
service RemoteTestDriverService {
