Pass buildbucket.build.id to cbuildbot as --buildbucket-id.

scripts/slave/recipe_modules/chromite/api.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import cgi
+import json

[dnj (Google), 2016/07/20 01:37:06]

We actually have a recipe module called "json":
https://github.com/luci/recipes-py/blob/master/recipe_modules/json/api.py#L76

You can import it by adding "json" to DEPS in "__init__.py".

[nxia1, 2016/07/20 05:24:22]

looks like it's already imported.

 import re
 
 from recipe_engine import recipe_api
 
 
 class Config(object):
   _NONE = object()
 
   def __init__(self, name, *layers):
     self.name = name
@@ skipping 46 matching lines @@
 
   def get_config_defaults(self):
     defaults = {
         'CBB_CONFIG': self.m.properties.get('cbb_config'),
         'CBB_BRANCH': self.m.properties.get('cbb_branch'),
         'CBB_DEBUG': self.m.properties.get('cbb_debug') is not None,
         'CBB_CLOBBER': 'clobber' in self.m.properties,
     }
     if 'buildnumber' in self.m.properties:
       defaults['CBB_BUILD_NUMBER'] = int(self.m.properties['buildnumber'])
+
+    if 'buildbucket' in self.m.properties:
+      buildbucket_json = json.loads(self.m.properties.get('buildbucket'))

[dnj (Google), 2016/07/20 01:37:06]

Use recipe module "self.m.json.loads" here instead of "loads".

[nxia1, 2016/07/20 05:24:22]

Done.

+      defaults['CBB_BUILDBUCKET_ID'] = buildbucket_json['build']['id']
+
     return defaults
 
   def _load_config_dump(self):
     if not self._cached_config:
       config_path = self.m.path.join(self.chromite_path,
                                      'cbuildbot', 'config_dump.json')
       step_result = self.m.json.read('read chromite config', config_path,
                                      add_json_log=False)
       self._cached_config = step_result.json.output
     return self._cached_config
@@ skipping 259 matching lines @@
     if self.c.cbb.chrome_rev:
       cbb_args.extend(['--chrome_rev', self.c.cbb.chrome_rev])
     if self.c.cbb.debug:
       cbb_args.extend(['--debug'])
     if self.c.cbb.clobber:
       cbb_args.extend(['--clobber'])
     if self.c.cbb.chrome_version:
       cbb_args.extend(['--chrome_version', self.c.cbb.chrome_version])
     if self.c.cbb.config_repo:
       cbb_args.extend(['--config_repo', self.c.cbb.config_repo])
+    if self.c.cbb.buildbucket_id:
+      cbb_args.extend(['--buildbucket-id', self.c.cbb.buildbucket_id])
     if self.c.repo_cache_dir and self.c.cbb.supports_repo_cache:
       cbb_args.extend(['--repo-cache', self.c.repo_cache_dir])
 
     # Set the build ID, if specified.
     if self.c.cbb.build_id:
       cbb_args.extend(['--master-build-id', self.c.cbb.build_id])
 
     # Add custom args, if there are any.
     cbb_args.extend(args)
 
     # Run cbuildbot.
     return self.cbuildbot(str('cbuildbot [%s]' % (self.c.cbb.config,)),
                           self.c.cbb.config,
                           args=cbb_args,
                           cwd=self.m.path['slave_build'])