swarmbucket: add $project template parameter

appengine/cr-buildbucket/swarming/test/swarming_test.py

 # Copyright 2015 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 base64
 import contextlib
 import datetime
 import json
 
 from components import auth
@@ skipping 42 matching lines @@
               recipe=project_config_pb2.Swarming.Recipe(
                   properties=['predefined-property:x'],
                   properties_j=['predefined-property-bool:true'],
               ),
               priority=108,
           ),
         ],
       ),
     )
     self.mock(
-        config, 'get_bucket_async', lambda name: futuristic(self.bucket_cfg))
+        config, 'get_bucket_async',
+        lambda name: futuristic(('chromium', self.bucket_cfg)))
 
     task_template = {
       'name': 'buildbucket-$bucket-$builder',
       'priority': '100',
       'expiration_secs': '3600',
       'properties': {
         'execution_timeout_secs': '3600',
         'inputs_ref': {
           'isolatedserver': 'https://isolateserver.appspot.com',
           'namespace': 'default-gzip',
           'isolated': 'cbacbdcbabcd'
         },
         'extra_args': [
           'cook',
           '-repository', '$repository',
           '-revision', '$revision',
           '-recipe', '$recipe',
           '-properties', '$properties_json',
+          '-logdog-project', '$project',
         ],
       },
       'numerical_value_for_coverage_in_format_obj': 42,
     }
     self.mock(config_component, 'get_self_config_async', mock.Mock())
     config_component.get_self_config_async.return_value = (
       futuristic((None, json.dumps(task_template))))
 
     self.mock(auth, 'delegate_async', mock.Mock())
     auth.delegate_async.return_value = futuristic('blah')
@@ skipping 60 matching lines @@
     builder_cfg = project_config_pb2.Swarming.Builder(name='fast-builder')
 
     build = model.Build(
         bucket='bucket',
         parameters={
           'builder_name': 'fast-builder',
         },
     )
 
     task_def = swarming.create_task_def_async(
-        self.bucket_cfg.swarming, builder_cfg, build).get_result()
+        'chromium', self.bucket_cfg.swarming, builder_cfg, build).get_result()
 
     self.assertEqual(
         task_def['properties']['execution_timeout_secs'], 120)
 
     builder_cfg.execution_timeout_secs = 60
     task_def = swarming.create_task_def_async(
-        self.bucket_cfg.swarming, builder_cfg, build).get_result()
+        'chromium', self.bucket_cfg.swarming, builder_cfg, build).get_result()
     self.assertEqual(
         task_def['properties']['execution_timeout_secs'], 60)
 
   def test_create_task_async(self):
     build = model.Build(
       bucket='bucket',
       tags=['builder:builder'],
       parameters={
         'builder_name': 'builder',
         'swarming': {
@@ skipping 66 matching lines @@
           '-repository', 'https://example.com/repo',
           '-revision', 'badcoffee',
           '-recipe', 'recipe',
           '-properties', json.dumps({
             'a': 'b',
             'blamelist': ['bob@example.com'],
             'buildername': 'builder',
             'predefined-property': 'x',
             'predefined-property-bool': True,
             'repository': 'https://chromium.googlesource.com/chromium/src',
-          }, sort_keys=True)
+          }, sort_keys=True),
+          '-logdog-project', 'chromium',
         ],
         'dimensions': sorted([
           {'key': 'cores', 'value': '8'},
           {'key': 'os', 'value': 'Linux'},
           {'key': 'pool', 'value': 'Chrome'},
         ]),
       },
       'pubsub_topic': 'projects/testbed-test/topics/swarming',
       'pubsub_userdata': json.dumps({
         'created_ts': utils.datetime_to_timestamp(utils.utcnow()),
@@ skipping 349 matching lines @@
     self.assertEqual(build.status, model.BuildStatus.COMPLETED)
     self.assertEqual(build.result, model.BuildResult.FAILURE)
     self.assertEqual(build.failure_reason, model.FailureReason.INFRA_FAILURE)
     self.assertIsNotNone(build.result_details)
     self.assertIsNone(build.lease_key)
     self.assertIsNotNone(build.complete_time)
 
 
 def b64json(data):
   return base64.b64encode(json.dumps(data))