swarmbucket: add $project template parameter

appengine/cr-buildbucket/swarming/swarming.py

 # Copyright 2014 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.
 
 """This module integrates buildbucket with swarming.
 
 A bucket config may have "swarming" field that specifies how a builder
 is mapped to a recipe. If build is scheduled for a bucket/builder
 with swarming configuration, the integration overrides the default behavior.
 
@@ skipping 60 matching lines @@
   _, text = yield component_config.get_self_config_async(
     'swarming_task_template.json', store_last_good=True)
   raise ndb.Return(json.loads(text) if text else None)
 
 
 @utils.memcache_async(
   'swarming/is_for_swarming', ['bucket_name', 'builder_name'], time=10 * 60)
 @ndb.tasklet
 def _is_for_swarming_async(bucket_name, builder_name):
   """Returns True if swarming is configured for |builder_name|."""
-  cfg = yield config.get_bucket_async(bucket_name)
+  _, cfg = yield config.get_bucket_async(bucket_name)
   if cfg and cfg.swarming:  # pragma: no branch
     for b in cfg.swarming.builders:
       if b.name == builder_name:
         raise ndb.Return(True)
   raise ndb.Return(False)
 
 
 @ndb.tasklet
 def is_for_swarming_async(build):
   """Returns True if |build|'s bucket and builder are designed for swarming."""
@@ skipping 74 matching lines @@
   props = read_properties(r1)
   props.update(read_properties(r2))
   recipe = project_config_pb2.Swarming.Recipe(
     repository=r2.repository or r1.repository,
     name=r2.name or r1.name,
   )
   return recipe, props
 
 
 @ndb.tasklet
-def create_task_def_async(swarming_cfg, builder_cfg, build):
+def create_task_def_async(project_id, swarming_cfg, builder_cfg, build):
   """Creates a swarming task definition for the |build|.
 
   Supports build properties that are supported by Buildbot-Buildbucket
   integration. See
   https://chromium.googlesource.com/chromium/tools/build/+/eff4ceb/scripts/master/buildbucket/README.md#Build-parameters
 
   Raises:
     errors.InvalidInputError if build.parameters are invalid.
   """
   params = build.parameters or {}
   validate_build_parameters(builder_cfg.name, params)
   swarming_param = params.get(PARAM_SWARMING) or {}
 
   # Render task template.
   task_template = yield get_task_template_async()
   task_template_params = {
     'bucket': build.bucket,
     'builder': builder_cfg.name,
+    'project': project_id,
   }
 
   is_recipe = (
       builder_cfg.HasField('recipe') or swarming_cfg.HasField('common_recipe'))
   if is_recipe:  # pragma: no branch
     recipe, build_properties = merge_recipe(
         swarming_cfg.common_recipe, builder_cfg.recipe)
     revision = swarming_param.get('recipe', {}).get('revision') or ''
 
     build_properties['buildername'] = builder_cfg.name
@@ skipping 102 matching lines @@
 @ndb.tasklet
 def create_task_async(build):
   """Creates a swarming task for the build and mutates the build.
 
   May be called only if is_for_swarming(build) == True.
   """
   if build.lease_key:
     raise errors.InvalidInputError(
       'swarming builders do not support creation of leased builds')
   builder_name = build.parameters[BUILDER_PARAMETER]
-  bucket_cfg = yield config.get_bucket_async(build.bucket)
+  project_id, bucket_cfg = yield config.get_bucket_async(build.bucket)
   builder_cfg = None
   for b in bucket_cfg.swarming.builders:  # pragma: no branch
     if b.name == builder_name:  # pragma: no branch
       builder_cfg = b
       break
   assert builder_cfg, 'Builder %s not found' % builder_name
 
-  task = yield create_task_def_async(bucket_cfg.swarming, builder_cfg, build)
+  task = yield create_task_def_async(
+      project_id, bucket_cfg.swarming, builder_cfg, build)
   res = yield _call_api_async(
     bucket_cfg.swarming.hostname, 'tasks/new', method='POST', payload=task,
     # Higher timeout than normal because if the task creation request
     # fails, but the task is actually created, later we will receive a
     # notification that the task is completed, but we won't have a build
     # for that task, which results in errors in the log.
     deadline=30,
     # This code path is executed by put and put_batch request handlers.
     # Clients should retry these requests on transient errors, so
     # do not retry requests to swarming.
@@ skipping 347 matching lines @@
 def _extend_unique(target, items):
   for x in items:
     if x not in target:  # pragma: no branch
       target.append(x)
 
 
 class TaskToken(tokens.TokenKind):
   expiration_sec = 60 * 60 * 24  # 24 hours.
   secret_key = auth.SecretKey('swarming_task_token', scope='local')
   version = 1