prototype: Add repeated BuilderConfig message to milestone message.
In the prototype protos for release configuration add a repeated
BuilderConfig message to the milestone message. This allows for the
definition of what will run at a milestone. Next step would be to cook
up such a config in other prototyping locations.
BUG=None
TEST=./generate.sh
Change-Id: I5d93677edfcd73321a1c2922461a2becdad674f5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/proto/+/2399678
Reviewed-by: Mike Nichols <mikenichols@chromium.org>
Reviewed-by: Andrew Lamb <andrewlamb@chromium.org>
Reviewed-by: C Shapiro <shapiroc@chromium.org>
Commit-Queue: David Burger <dburger@chromium.org>
Tested-by: David Burger <dburger@chromium.org>
diff --git a/go/prototype/builder_config.pb.go b/go/prototype/builder_config.pb.go
new file mode 100644
index 0000000..8230b3e
--- /dev/null
+++ b/go/prototype/builder_config.pb.go
@@ -0,0 +1,94 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: prototype/builder_config.proto
+
+package prototype
+
+import (
+ fmt "fmt"
+ proto "github.com/golang/protobuf/proto"
+ prototype "go.chromium.org/chromiumos/config/go/prototype"
+ math "math"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+// Defines a builder from platform's point of view.
+type BuilderConfig struct {
+ // Whether this builder should be considered criticial.
+ Critical bool `protobuf:"varint,1,opt,name=critical,proto3" json:"critical,omitempty"`
+ // Defines the build target for this builder config.
+ BuildTargets []*prototype.BuildTarget `protobuf:"bytes,2,rep,name=build_targets,json=buildTargets,proto3" json:"build_targets,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
+}
+
+func (m *BuilderConfig) Reset() { *m = BuilderConfig{} }
+func (m *BuilderConfig) String() string { return proto.CompactTextString(m) }
+func (*BuilderConfig) ProtoMessage() {}
+func (*BuilderConfig) Descriptor() ([]byte, []int) {
+ return fileDescriptor_3f63408d3c1e26ca, []int{0}
+}
+
+func (m *BuilderConfig) XXX_Unmarshal(b []byte) error {
+ return xxx_messageInfo_BuilderConfig.Unmarshal(m, b)
+}
+func (m *BuilderConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+ return xxx_messageInfo_BuilderConfig.Marshal(b, m, deterministic)
+}
+func (m *BuilderConfig) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_BuilderConfig.Merge(m, src)
+}
+func (m *BuilderConfig) XXX_Size() int {
+ return xxx_messageInfo_BuilderConfig.Size(m)
+}
+func (m *BuilderConfig) XXX_DiscardUnknown() {
+ xxx_messageInfo_BuilderConfig.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_BuilderConfig proto.InternalMessageInfo
+
+func (m *BuilderConfig) GetCritical() bool {
+ if m != nil {
+ return m.Critical
+ }
+ return false
+}
+
+func (m *BuilderConfig) GetBuildTargets() []*prototype.BuildTarget {
+ if m != nil {
+ return m.BuildTargets
+ }
+ return nil
+}
+
+func init() {
+ proto.RegisterType((*BuilderConfig)(nil), "prototype.BuilderConfig")
+}
+
+func init() { proto.RegisterFile("prototype/builder_config.proto", fileDescriptor_3f63408d3c1e26ca) }
+
+var fileDescriptor_3f63408d3c1e26ca = []byte{
+ // 182 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2b, 0x28, 0xca, 0x2f,
+ 0xc9, 0x2f, 0xa9, 0x2c, 0x48, 0xd5, 0x4f, 0x2a, 0xcd, 0xcc, 0x49, 0x49, 0x2d, 0x8a, 0x4f, 0xce,
+ 0xcf, 0x4b, 0xcb, 0x4c, 0xd7, 0x03, 0x4b, 0x08, 0x71, 0xc2, 0xe5, 0xa5, 0xf4, 0x92, 0x33, 0x8a,
+ 0xf2, 0x73, 0x33, 0x4b, 0x73, 0xf3, 0x8b, 0xf5, 0x21, 0x6a, 0xf4, 0xd1, 0x34, 0xc7, 0x97, 0x24,
+ 0x16, 0xa5, 0xa7, 0x96, 0x40, 0xb4, 0x2a, 0x55, 0x71, 0xf1, 0x3a, 0x41, 0x8c, 0x74, 0x06, 0xab,
+ 0x16, 0x92, 0xe2, 0xe2, 0x48, 0x2e, 0xca, 0x2c, 0xc9, 0x4c, 0x4e, 0xcc, 0x91, 0x60, 0x54, 0x60,
+ 0xd4, 0xe0, 0x08, 0x82, 0xf3, 0x85, 0x7c, 0xb9, 0x78, 0x91, 0x8d, 0x28, 0x96, 0x60, 0x52, 0x60,
+ 0xd6, 0xe0, 0x36, 0xd2, 0x40, 0xb2, 0x54, 0x0f, 0xd9, 0x61, 0x20, 0x4b, 0xf5, 0xc0, 0xc6, 0x87,
+ 0x80, 0x35, 0x04, 0xf1, 0x24, 0x21, 0x38, 0xc5, 0x4e, 0xa6, 0x51, 0xc6, 0xe9, 0xf9, 0x70, 0xbd,
+ 0x7a, 0xf9, 0x45, 0xe9, 0xfa, 0x48, 0xae, 0xcf, 0xcc, 0x4b, 0x2b, 0x4a, 0x84, 0x38, 0x5e, 0x3f,
+ 0x3d, 0x1f, 0xe1, 0x8b, 0x24, 0x36, 0x30, 0xd3, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xec, 0xdc,
+ 0x0a, 0x52, 0x16, 0x01, 0x00, 0x00,
+}
diff --git a/go/prototype/milestone.pb.go b/go/prototype/milestone.pb.go
index 736a0cf..ffe5292 100644
--- a/go/prototype/milestone.pb.go
+++ b/go/prototype/milestone.pb.go
@@ -31,10 +31,12 @@
// E.g. release-R86-13421.B
BranchName string `protobuf:"bytes,3,opt,name=branch_name,json=branchName,proto3" json:"branch_name,omitempty"`
// Defines the overall timeline for channel releases of the given milestone.
- ChannelPlan []*Milestone_ChannelPlan `protobuf:"bytes,4,rep,name=channel_plan,json=channelPlan,proto3" json:"channel_plan,omitempty"`
- XXX_NoUnkeyedLiteral struct{} `json:"-"`
- XXX_unrecognized []byte `json:"-"`
- XXX_sizecache int32 `json:"-"`
+ ChannelPlan []*Milestone_ChannelPlan `protobuf:"bytes,4,rep,name=channel_plan,json=channelPlan,proto3" json:"channel_plan,omitempty"`
+ // Defines the builds that run for the given milestone.
+ BuilderConfigs []*BuilderConfig `protobuf:"bytes,5,rep,name=builder_configs,json=builderConfigs,proto3" json:"builder_configs,omitempty"`
+ XXX_NoUnkeyedLiteral struct{} `json:"-"`
+ XXX_unrecognized []byte `json:"-"`
+ XXX_sizecache int32 `json:"-"`
}
func (m *Milestone) Reset() { *m = Milestone{} }
@@ -90,6 +92,13 @@
return nil
}
+func (m *Milestone) GetBuilderConfigs() []*BuilderConfig {
+ if m != nil {
+ return m.BuilderConfigs
+ }
+ return nil
+}
+
type Milestone_Date struct {
// Format: YYYY-MM-DD (ISO 8601)
// E.g. 2020-02-10
@@ -188,24 +197,27 @@
func init() { proto.RegisterFile("prototype/milestone.proto", fileDescriptor_6ab89a7e2a69ffab) }
var fileDescriptor_6ab89a7e2a69ffab = []byte{
- // 300 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x90, 0xcd, 0x4a, 0x3b, 0x31,
- 0x14, 0xc5, 0x99, 0x7e, 0xfd, 0x99, 0x3b, 0xff, 0x85, 0x46, 0xd1, 0x69, 0x11, 0x1c, 0x5c, 0xcd,
- 0x42, 0x26, 0xd0, 0xe2, 0x0b, 0xb4, 0x82, 0xb8, 0x50, 0x24, 0x4b, 0x37, 0xe5, 0x76, 0xbc, 0x4e,
- 0x0b, 0xf9, 0x28, 0x69, 0x2a, 0xf8, 0x02, 0xbe, 0xb3, 0x3b, 0x69, 0x92, 0x4e, 0xbb, 0x70, 0xe1,
- 0x2e, 0xe7, 0xe4, 0xfc, 0xce, 0x4d, 0x2e, 0x0c, 0xd7, 0xd6, 0x38, 0xe3, 0x3e, 0xd7, 0xc4, 0xd5,
- 0x4a, 0xd2, 0xc6, 0x19, 0x4d, 0x95, 0xf7, 0x58, 0xda, 0x5e, 0x8d, 0x2e, 0x0f, 0xa9, 0x7a, 0x89,
- 0x5a, 0x93, 0x0c, 0x99, 0x9b, 0xef, 0x0e, 0xa4, 0x4f, 0x7b, 0x8e, 0x5d, 0xc0, 0x40, 0x6f, 0xd5,
- 0x82, 0x6c, 0x9e, 0x14, 0x49, 0xd9, 0x17, 0x51, 0xb1, 0x07, 0x60, 0x0e, 0x6d, 0x43, 0x6e, 0xbe,
- 0xb0, 0xa8, 0xeb, 0xe5, 0xfc, 0x0d, 0x1d, 0xe5, 0x9d, 0x22, 0x29, 0xb3, 0xf1, 0xb0, 0x6a, 0xbb,
- 0xab, 0xb6, 0xa9, 0xba, 0x47, 0x47, 0xe2, 0x24, 0x40, 0x53, 0xcf, 0xec, 0x1c, 0x76, 0x0d, 0x59,
- 0x6c, 0xd0, 0xa8, 0x28, 0xef, 0x16, 0x49, 0x99, 0x0a, 0x08, 0xd6, 0x33, 0x2a, 0x62, 0x33, 0xf8,
- 0x1f, 0x1f, 0x38, 0x5f, 0x4b, 0xd4, 0x79, 0xaf, 0xe8, 0x96, 0xd9, 0xb8, 0xf8, 0x75, 0xc6, 0x2c,
- 0x04, 0x5f, 0x24, 0x6a, 0x91, 0xd5, 0x07, 0x31, 0xba, 0x82, 0x9e, 0x9f, 0x76, 0x0e, 0xfd, 0x0f,
- 0x94, 0x5b, 0xf2, 0xbf, 0x49, 0x45, 0x10, 0xa3, 0xaf, 0x04, 0xb2, 0x23, 0x94, 0xdd, 0xc2, 0xbf,
- 0x08, 0xfb, 0x5c, 0x36, 0x66, 0x47, 0xd3, 0x62, 0x50, 0xec, 0x23, 0xec, 0x11, 0xce, 0xe2, 0x2a,
- 0x2c, 0x49, 0xc2, 0x0d, 0xfd, 0x71, 0x17, 0xa7, 0x81, 0x12, 0x01, 0xda, 0x59, 0xd3, 0xbb, 0xd7,
- 0x49, 0x63, 0xaa, 0x7a, 0x69, 0x8d, 0x5a, 0x6d, 0x55, 0x65, 0x6c, 0xc3, 0xf7, 0xc2, 0x6c, 0xf8,
- 0x4a, 0xbf, 0x5b, 0xe4, 0xbe, 0x8f, 0x37, 0x86, 0xb7, 0xc5, 0x8b, 0x81, 0x3f, 0x4e, 0x7e, 0x02,
- 0x00, 0x00, 0xff, 0xff, 0x02, 0xd4, 0x37, 0x8e, 0xfa, 0x01, 0x00, 0x00,
+ // 340 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x90, 0xcf, 0x4a, 0xfb, 0x40,
+ 0x10, 0xc7, 0xc9, 0xaf, 0x7f, 0x7e, 0x64, 0x22, 0xfe, 0x59, 0x45, 0xd3, 0x20, 0x1a, 0x3c, 0xe5,
+ 0x20, 0x09, 0xb4, 0xf8, 0x00, 0xb6, 0x82, 0x78, 0x50, 0x64, 0x8f, 0x5e, 0xc2, 0x26, 0x9d, 0xa6,
+ 0x81, 0xcd, 0x6e, 0xd9, 0x6c, 0x04, 0x5f, 0xc0, 0xa7, 0xf2, 0xe1, 0xa4, 0xbb, 0x69, 0x1a, 0xc1,
+ 0x83, 0xb7, 0xfd, 0xce, 0x7c, 0xe6, 0x33, 0xcb, 0xc0, 0x64, 0xa3, 0xa4, 0x96, 0xfa, 0x63, 0x83,
+ 0x49, 0x55, 0x72, 0xac, 0xb5, 0x14, 0x18, 0x9b, 0x1a, 0x71, 0xbb, 0x56, 0x70, 0xb5, 0xa7, 0xb2,
+ 0xa6, 0xe4, 0x4b, 0x54, 0x69, 0x2e, 0xc5, 0xaa, 0x2c, 0x2c, 0x1a, 0x5c, 0xec, 0xfb, 0xf9, 0x9a,
+ 0x09, 0x81, 0xdc, 0x36, 0x6e, 0xbe, 0x06, 0xe0, 0x3e, 0xef, 0xbc, 0xe4, 0x1c, 0xc6, 0xa2, 0xa9,
+ 0x32, 0x54, 0xbe, 0x13, 0x3a, 0xd1, 0x88, 0xb6, 0x89, 0x3c, 0x02, 0xd1, 0x4c, 0x15, 0xa8, 0xd3,
+ 0x4c, 0x31, 0x91, 0xaf, 0xd3, 0x25, 0xd3, 0xe8, 0xff, 0x0b, 0x9d, 0xc8, 0x9b, 0x4e, 0xe2, 0xce,
+ 0x1d, 0x77, 0xa6, 0xf8, 0x81, 0x69, 0xa4, 0xc7, 0x76, 0x68, 0x6e, 0x66, 0xb6, 0x15, 0x72, 0x0d,
+ 0x5e, 0x6b, 0x10, 0xac, 0x42, 0x7f, 0x10, 0x3a, 0x91, 0x4b, 0xc1, 0x96, 0x5e, 0x58, 0x85, 0x64,
+ 0x01, 0x07, 0xed, 0x07, 0xd3, 0x0d, 0x67, 0xc2, 0x1f, 0x86, 0x83, 0xc8, 0x9b, 0x86, 0xbf, 0xee,
+ 0x58, 0x58, 0xf0, 0x95, 0x33, 0x41, 0xbd, 0x7c, 0x1f, 0xc8, 0x3d, 0x1c, 0xfd, 0xbc, 0x42, 0xed,
+ 0x8f, 0x8c, 0xc7, 0xef, 0x79, 0xe6, 0x96, 0x58, 0x18, 0x80, 0x1e, 0x66, 0xfd, 0x58, 0x07, 0x97,
+ 0x30, 0x34, 0x1f, 0x3e, 0x83, 0xd1, 0x3b, 0xe3, 0x0d, 0x9a, 0x83, 0xb8, 0xd4, 0x86, 0xe0, 0xd3,
+ 0x01, 0xaf, 0xb7, 0x9d, 0xdc, 0xc2, 0xff, 0x76, 0xbf, 0xe1, 0xbc, 0x29, 0xe9, 0x2d, 0x6a, 0x41,
+ 0xba, 0x43, 0xc8, 0x13, 0x9c, 0xb6, 0xd7, 0x54, 0xc8, 0x91, 0xd5, 0xf8, 0xc7, 0x73, 0x9e, 0xd8,
+ 0x29, 0x6a, 0x87, 0xb6, 0xa5, 0xf9, 0xdd, 0xdb, 0xac, 0x90, 0x71, 0xbe, 0x56, 0xb2, 0x2a, 0x9b,
+ 0x2a, 0x96, 0xaa, 0x48, 0x76, 0x41, 0xd6, 0x49, 0x29, 0x56, 0x8a, 0x25, 0xc6, 0x97, 0x14, 0x32,
+ 0xe9, 0xc4, 0xd9, 0xd8, 0x3c, 0x67, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7f, 0x39, 0xcf, 0xd7,
+ 0x5d, 0x02, 0x00, 0x00,
}
diff --git a/src/prototype/builder_config.proto b/src/prototype/builder_config.proto
new file mode 100644
index 0000000..3dde0ea
--- /dev/null
+++ b/src/prototype/builder_config.proto
@@ -0,0 +1,21 @@
+// Copyright 2020 The Chromium OS Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+syntax = "proto3";
+
+package prototype;
+
+import "chromiumos/config/prototype/build_target.proto";
+
+option go_package = "go.chromium.org/chromiumos/infra/proto/go/prototype";
+
+// Defines a builder from platform's point of view.
+message BuilderConfig {
+
+ // Whether this builder should be considered criticial.
+ bool critical = 1;
+
+ // Defines the build target for this builder config.
+ repeated chromiumos.config.prototype.BuildTarget build_targets = 2;
+}
diff --git a/src/prototype/milestone.proto b/src/prototype/milestone.proto
index 26bc168..11880b5 100644
--- a/src/prototype/milestone.proto
+++ b/src/prototype/milestone.proto
@@ -6,6 +6,7 @@
package prototype;
+import "prototype/builder_config.proto";
import "prototype/channel.proto";
option go_package = "go.chromium.org/chromiumos/infra/proto/go/prototype";
@@ -37,4 +38,7 @@
// Defines the overall timeline for channel releases of the given milestone.
repeated ChannelPlan channel_plan = 4;
+
+ // Defines the builds that run for the given milestone.
+ repeated BuilderConfig builder_configs = 5;
}
