swarmbucket: refactor builder defaults

appengine/cr-buildbucket/proto/project_config_pb2.py

 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: project_config.proto
 
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import descriptor_pb2
 # @@protoc_insertion_point(imports)
 
 
 
 
 DESCRIPTOR = _descriptor.FileDescriptor(
   name='project_config.proto',
   package='buildbucket',
-  serialized_pb='\n\x14project_config.proto\x12\x0b\x62uildbucket\"z\n\x03\x41\x63l\x12#\n\x04role\x18\x01 \x01(\x0e\x32\x15.buildbucket.Acl.Role\x12\r\n\x05group\x18\x02 \x01(\t\x12\x10\n\x08identity\x18\x03 \x01(\t\"-\n\x04Role\x12\n\n\x06READER\x10\x00\x12\r\n\tSCHEDULER\x10\x01\x12\n\n\x06WRITER\x10\x02\"\xac\x04\n\x08Swarming\x12\x10\n\x08hostname\x18\x01 \x01(\t\x12\x12\n\nurl_format\x18\x02 \x01(\t\x12\x1c\n\x14\x63ommon_swarming_tags\x18\x03 \x03(\t\x12\x19\n\x11\x63ommon_dimensions\x18\x04 \x03(\t\x12/\n\x08\x62uilders\x18\x05 \x03(\x0b\x32\x1d.buildbucket.Swarming.Builder\x12\x33\n\rcommon_recipe\x18\x06 \x01(\x0b\x32\x1c.buildbucket.Swarming.Recipe\x12%\n\x1d\x63ommon_execution_timeout_secs\x18\x07 \x01(\r\x12\'\n\x1ftask_template_canary_percentage\x18\x08 \x01(\r\x1aT\n\x06Recipe\x12\x12\n\nrepository\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x12\n\nproperties\x18\x03 \x03(\t\x12\x14\n\x0cproperties_j\x18\x04 \x03(\t\x1a\xb4\x01\n\x07\x42uilder\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x10\n\x08\x63\x61tegory\x18\x06 \x01(\t\x12\x15\n\rswarming_tags\x18\x02 \x03(\t\x12\x12\n\ndimensions\x18\x03 \x03(\t\x12,\n\x06recipe\x18\x04 \x01(\x0b\x32\x1c.buildbucket.Swarming.Recipe\x12\x10\n\x08priority\x18\x05 \x01(\r\x12\x1e\n\x16\x65xecution_timeout_secs\x18\x07 \x01(\r\"_\n\x06\x42ucket\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x1e\n\x04\x61\x63ls\x18\x02 \x03(\x0b\x32\x10.buildbucket.Acl\x12\'\n\x08swarming\x18\x03 \x01(\x0b\x32\x15.buildbucket.Swarming\"6\n\x0e\x42uildbucketCfg\x12$\n\x07\x62uckets\x18\x01 \x03(\x0b\x32\x13.buildbucket.Bucket')
+  serialized_pb='\n\x14project_config.proto\x12\x0b\x62uildbucket\"z\n\x03\x41\x63l\x12#\n\x04role\x18\x01 \x01(\x0e\x32\x15.buildbucket.Acl.Role\x12\r\n\x05group\x18\x02 \x01(\t\x12\x10\n\x08identity\x18\x03 \x01(\t\"-\n\x04Role\x12\n\n\x06READER\x10\x00\x12\r\n\tSCHEDULER\x10\x01\x12\n\n\x06WRITER\x10\x02\"\xe5\x04\n\x08Swarming\x12\x10\n\x08hostname\x18\x01 \x01(\t\x12\x12\n\nurl_format\x18\x02 \x01(\t\x12\x37\n\x10\x62uilder_defaults\x18\t \x01(\x0b\x32\x1d.buildbucket.Swarming.Builder\x12\x1c\n\x14\x63ommon_swarming_tags\x18\x03 \x03(\t\x12\x19\n\x11\x63ommon_dimensions\x18\x04 \x03(\t\x12/\n\x08\x62uilders\x18\x05 \x03(\x0b\x32\x1d.buildbucket.Swarming.Builder\x12\x33\n\rcommon_recipe\x18\x06 \x01(\x0b\x32\x1c.buildbucket.Swarming.Recipe\x12%\n\x1d\x63ommon_execution_timeout_secs\x18\x07 \x01(\r\x12\'\n\x1ftask_template_canary_percentage\x18\x08 \x01(\r\x1aT\n\x06Recipe\x12\x12\n\nrepository\x18\x01 \x01(\t\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x12\n\nproperties\x18\x03 \x03(\t\x12\x14\n\x0cproperties_j\x18\x04 \x03(\t\x1a\xb4\x01\n\x07\x42uilder\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x10\n\x08\x63\x61tegory\x18\x06 \x01(\t\x12\x15\n\rswarming_tags\x18\x02 \x03(\t\x12\x12\n\ndimensions\x18\x03 \x03(\t\x12,\n\x06recipe\x18\x04 \x01(\x0b\x32\x1c.buildbucket.Swarming.Recipe\x12\x10\n\x08priority\x18\x05 \x01(\r\x12\x1e\n\x16\x65xecution_timeout_secs\x18\x07 \x01(\r\"_\n\x06\x42ucket\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x1e\n\x04\x61\x63ls\x18\x02 \x03(\x0b\x32\x10.buildbucket.Acl\x12\'\n\x08swarming\x18\x03 \x01(\x0b\x32\x15.buildbucket.Swarming\"6\n\x0e\x42uildbucketCfg\x12$\n\x07\x62uckets\x18\x01 \x03(\x0b\x32\x13.buildbucket.Bucket')
 
 
 
 _ACL_ROLE = _descriptor.EnumDescriptor(
   name='Role',
   full_name='buildbucket.Acl.Role',
   filename=None,
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
@@ skipping 96 matching lines @@
       options=None),
   ],
   extensions=[
   ],
   nested_types=[],
   enum_types=[
   ],
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=451,
-  serialized_end=535,
+  serialized_start=508,
+  serialized_end=592,
 )
 
 _SWARMING_BUILDER = _descriptor.Descriptor(
   name='Builder',
   full_name='buildbucket.Swarming.Builder',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
@@ skipping 47 matching lines @@
       options=None),
   ],
   extensions=[
   ],
   nested_types=[],
   enum_types=[
   ],
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=538,
-  serialized_end=718,
+  serialized_start=595,
+  serialized_end=775,
 )
 
 _SWARMING = _descriptor.Descriptor(
   name='Swarming',
   full_name='buildbucket.Swarming',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
       name='hostname', full_name='buildbucket.Swarming.hostname', index=0,
       number=1, type=9, cpp_type=9, label=1,
       has_default_value=False, default_value=unicode("", "utf-8"),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
       name='url_format', full_name='buildbucket.Swarming.url_format', index=1,
       number=2, type=9, cpp_type=9, label=1,
       has_default_value=False, default_value=unicode("", "utf-8"),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
-      name='common_swarming_tags', full_name='buildbucket.Swarming.common_swarming_tags', index=2,
+      name='builder_defaults', full_name='buildbucket.Swarming.builder_defaults', index=2,
+      number=9, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='common_swarming_tags', full_name='buildbucket.Swarming.common_swarming_tags', index=3,
       number=3, type=9, cpp_type=9, label=3,
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
-      name='common_dimensions', full_name='buildbucket.Swarming.common_dimensions', index=3,
+      name='common_dimensions', full_name='buildbucket.Swarming.common_dimensions', index=4,
       number=4, type=9, cpp_type=9, label=3,
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
-      name='builders', full_name='buildbucket.Swarming.builders', index=4,
+      name='builders', full_name='buildbucket.Swarming.builders', index=5,
       number=5, type=11, cpp_type=10, label=3,
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
-      name='common_recipe', full_name='buildbucket.Swarming.common_recipe', index=5,
+      name='common_recipe', full_name='buildbucket.Swarming.common_recipe', index=6,
       number=6, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
-      name='common_execution_timeout_secs', full_name='buildbucket.Swarming.common_execution_timeout_secs', index=6,
+      name='common_execution_timeout_secs', full_name='buildbucket.Swarming.common_execution_timeout_secs', index=7,
       number=7, type=13, cpp_type=3, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
     _descriptor.FieldDescriptor(
-      name='task_template_canary_percentage', full_name='buildbucket.Swarming.task_template_canary_percentage', index=7,
+      name='task_template_canary_percentage', full_name='buildbucket.Swarming.task_template_canary_percentage', index=8,
       number=8, type=13, cpp_type=3, label=1,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
   ],
   extensions=[
   ],
   nested_types=[_SWARMING_RECIPE, _SWARMING_BUILDER, ],
   enum_types=[
   ],
   options=None,
   is_extendable=False,
   extension_ranges=[],
   serialized_start=162,
-  serialized_end=718,
+  serialized_end=775,
 )
 
 
 _BUCKET = _descriptor.Descriptor(
   name='Bucket',
   full_name='buildbucket.Bucket',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
@@ skipping 20 matching lines @@
       options=None),
   ],
   extensions=[
   ],
   nested_types=[],
   enum_types=[
   ],
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=720,
-  serialized_end=815,
+  serialized_start=777,
+  serialized_end=872,
 )
 
 
 _BUILDBUCKETCFG = _descriptor.Descriptor(
   name='BuildbucketCfg',
   full_name='buildbucket.BuildbucketCfg',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
       name='buckets', full_name='buildbucket.BuildbucketCfg.buckets', index=0,
       number=1, type=11, cpp_type=10, label=3,
       has_default_value=False, default_value=[],
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
   ],
   extensions=[
   ],
   nested_types=[],
   enum_types=[
   ],
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=817,
-  serialized_end=871,
+  serialized_start=874,
+  serialized_end=928,
 )
 
 _ACL.fields_by_name['role'].enum_type = _ACL_ROLE
 _ACL_ROLE.containing_type = _ACL;
 _SWARMING_RECIPE.containing_type = _SWARMING;
 _SWARMING_BUILDER.fields_by_name['recipe'].message_type = _SWARMING_RECIPE
 _SWARMING_BUILDER.containing_type = _SWARMING;
+_SWARMING.fields_by_name['builder_defaults'].message_type = _SWARMING_BUILDER
 _SWARMING.fields_by_name['builders'].message_type = _SWARMING_BUILDER
 _SWARMING.fields_by_name['common_recipe'].message_type = _SWARMING_RECIPE
 _BUCKET.fields_by_name['acls'].message_type = _ACL
 _BUCKET.fields_by_name['swarming'].message_type = _SWARMING
 _BUILDBUCKETCFG.fields_by_name['buckets'].message_type = _BUCKET
 DESCRIPTOR.message_types_by_name['Acl'] = _ACL
 DESCRIPTOR.message_types_by_name['Swarming'] = _SWARMING
 DESCRIPTOR.message_types_by_name['Bucket'] = _BUCKET
 DESCRIPTOR.message_types_by_name['BuildbucketCfg'] = _BUILDBUCKETCFG
 
@@ skipping 28 matching lines @@
   # @@protoc_insertion_point(class_scope:buildbucket.Bucket)
 
 class BuildbucketCfg(_message.Message):
   __metaclass__ = _reflection.GeneratedProtocolMessageType
   DESCRIPTOR = _BUILDBUCKETCFG
 
   # @@protoc_insertion_point(class_scope:buildbucket.BuildbucketCfg)
 
 
 # @@protoc_insertion_point(module_scope)