swarmbucket: add bucket-level execution timeout

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 247 matching lines @@
   _extend_unique(swarming_tags, builder_cfg.swarming_tags)
   _extend_unique(swarming_tags, build.tags)
   swarming_tags.sort()
 
   task_properties = task.setdefault('properties', {})
   task_properties['dimensions'] = _prepare_dimensions(
     task_properties.get('dimensions', []),
     swarming_cfg.common_dimensions,
     builder_cfg.dimensions
   )
+
+  if swarming_cfg.common_execution_timeout_secs > 0:
+    task_properties['execution_timeout_secs'] = (
+        swarming_cfg.common_execution_timeout_secs)
   if builder_cfg.execution_timeout_secs > 0:
     task_properties['execution_timeout_secs'] = (
         builder_cfg.execution_timeout_secs)
 
   task['pubsub_topic'] = (
     'projects/%s/topics/%s' %
     (app_identity.get_application_id(), PUBSUB_TOPIC))
   task['pubsub_auth_token'] = TaskToken.generate()
   task['pubsub_userdata'] = json.dumps({
     'created_ts': utils.datetime_to_timestamp(utils.utcnow()),
@@ skipping 133 matching lines @@
     'CANCELED',
     'COMPLETED'
   )
   if state in ('PENDING', 'RUNNING'):
     build.status = model.BuildStatus.STARTED
   elif state in terminal_states:
     build.status = model.BuildStatus.COMPLETED
     if state == 'CANCELED':
       build.result = model.BuildResult.CANCELED
       build.cancelation_reason = model.CancelationReason.CANCELED_EXPLICITLY
-    elif state in ('TIMED_OUT', 'EXPIRED'):
+    elif state == 'EXPIRED':
+      # Task did not start.
       build.result = model.BuildResult.CANCELED
       build.cancelation_reason = model.CancelationReason.TIMEOUT
+    elif state == 'TIMED_OUT':
+      # Task started, but timed out.
+      build.result = model.BuildResult.FAILURE
+      build.failure_reason = model.FailureReason.INFRA_FAILURE
     elif state == 'BOT_DIED' or result.get('internal_failure'):
       build.result = model.BuildResult.FAILURE
       build.failure_reason = model.FailureReason.INFRA_FAILURE
     elif result.get('failure'):
       build.result = model.BuildResult.FAILURE
       build.failure_reason = model.FailureReason.BUILD_FAILURE
     else:
       assert state == 'COMPLETED'
       build.result = model.BuildResult.SUCCESS
   else:  # pragma: no cover
@@ skipping 240 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