Rename to job execution timeoutadd-failure-reason-for-execution-timeout

4 files changed, 6 insertions, 6 deletions

diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 66c240c64e5..7d36f9982ab 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -51,7 +51,7 @@ class CommitStatus < ActiveRecord::Base
     missing_dependency_failure: 5,
     runner_unsupported: 6,
     stale_schedule: 7,
-    runner_execution_timeout: 8
+    job_execution_timeout: 8
   }
 
   ##
diff --git a/app/presenters/commit_status_presenter.rb b/app/presenters/commit_status_presenter.rb
index 454f969f30a..a866e76df5a 100644
--- a/app/presenters/commit_status_presenter.rb
+++ b/app/presenters/commit_status_presenter.rb
@@ -10,7 +10,7 @@ class CommitStatusPresenter < Gitlab::View::Presenter::Delegated
     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',
-    runner_execution_timeout: 'The script exceeded the maximum execution time set for the runner'
+    job_execution_timeout: 'The script exceeded the maximum execution time set for the job'
   }.freeze
 
   private_constant :CALLOUT_FAILURE_MESSAGES
diff --git a/lib/gitlab/ci/status/build/failed.rb b/lib/gitlab/ci/status/build/failed.rb
index 6148b789b23..4babc23a495 100644
--- a/lib/gitlab/ci/status/build/failed.rb
+++ b/lib/gitlab/ci/status/build/failed.rb
@@ -12,7 +12,7 @@ module Gitlab
             missing_dependency_failure: 'missing dependency failure',
             runner_unsupported: 'unsupported runner',
             stale_schedule: 'stale schedule',
-            runner_execution_timeout: 'runner execution timeout'
+            job_execution_timeout: 'job execution timeout'
           }.freeze
 
           private_constant :REASONS
diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb
index 9cf39ddc183..909703a8d47 100644
--- a/spec/requests/api/runner_spec.rb
+++ b/spec/requests/api/runner_spec.rb
@@ -807,13 +807,13 @@ describe API::Runner, :clean_gitlab_redis_shared_state do
           it { expect(job).to be_unknown_failure }
         end
 
-        context 'when failure_reason is runner_execution_timeout' do
+        context 'when failure_reason is job_execution_timeout' do
           before do
-            update_job(state: 'failed', failure_reason: 'runner_execution_timeout')
+            update_job(state: 'failed', failure_reason: 'job_execution_timeout')
             job.reload
           end
 
-          it { expect(job).to be_runner_execution_timeout }
+          it { expect(job).to be_job_execution_timeout }
         end
       end