swarmbucket: task TIMED_OUT is infra failure

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 406 matching lines @@
   )
   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 == 'EXPIRED':
       # Task did not start.
-      build.result = model.BuildResult.CANCELED
-      build.cancelation_reason = model.CancelationReason.TIMEOUT
+      build.result = model.BuildResult.FAILURE
+      build.failure_reason = model.FailureReason.INFRA_FAILURE
     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
@@ skipping 244 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