Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-28

# Conflicts:
#	app/models/commit_status.rb

[ci skip]

app/models/commit_status.rb

@@ -52,8 +52,14 @@ class CommitStatus < ActiveRecord::Base
     runner_system_failure: 4,
     missing_dependency_failure: 5,
     runner_unsupported: 6,
+<<<<<<< HEAD
     stale_schedule: 7
   }.merge(EE_FAILURE_REASONS)
+=======
+    stale_schedule: 7,
+    job_execution_timeout: 8
+  }
+>>>>>>> upstream/master
 
   ##
   # We still create some CommitStatuses outside of CreatePipelineService.

app/presenters/commit_status_presenter.rb

@@ -8,7 +8,8 @@ class CommitStatusPresenter < Gitlab::View::Presenter::Delegated
     runner_system_failure: 'There has been a runner system failure, please try again',
     missing_dependency_failure: 'There has been a missing dependency failure',
     runner_unsupported: 'Your runner is outdated, please upgrade your runner',
-    stale_schedule: 'Delayed job could not be executed by some reason, please try again'
+    stale_schedule: 'Delayed job could not be executed by some reason, please try again',
+    job_execution_timeout: 'The script exceeded the maximum execution time set for the job'
   }.freeze
 
   private_constant :CALLOUT_FAILURE_MESSAGES

changelogs/unreleased/add-failure-reason-for-execution-timeout.yml

+---
+title: Add failure reason for execution timeout
+merge_request: 22224
+author:
+type: changed

lib/gitlab/ci/status/build/failed.rb

@@ -11,7 +11,8 @@ module Gitlab
             runner_system_failure: 'runner system failure',
             missing_dependency_failure: 'missing dependency failure',
             runner_unsupported: 'unsupported runner',
-            stale_schedule: 'stale schedule'
+            stale_schedule: 'stale schedule',
+            job_execution_timeout: 'job execution timeout'
           }.freeze
 
           private_constant :REASONS

spec/requests/api/runner_spec.rb

@@ -811,6 +811,15 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
 
           it { expect(job).to be_unknown_failure }
         end
+
+        context 'when failure_reason is job_execution_timeout' do
+          before do
+            update_job(state: 'failed', failure_reason: 'job_execution_timeout')
+            job.reload
+          end
+
+          it { expect(job).to be_job_execution_timeout }
+        end
       end
 
       context 'when trace is given' do