Show timeout information on job's page

3 files changed, 29 insertions, 3 deletions

diff --git a/app/assets/javascripts/jobs/components/sidebar_details_block.vue b/app/assets/javascripts/jobs/components/sidebar_details_block.vue
index 56814a52525..94c2084623b 100644
--- a/app/assets/javascripts/jobs/components/sidebar_details_block.vue
+++ b/app/assets/javascripts/jobs/components/sidebar_details_block.vue
@@ -39,6 +39,15 @@
       runnerId() {
         return `#${this.job.runner.id}`;
       },
+      timeout() {
+        let t = `${this.job.timeout.value}`;
+
+        if (this.job.timeout.source != null) {
+          t += ` (from ${this.job.timeout.source})`;
+        }
+
+        return t;
+      },
       renderBlock() {
         return this.job.merge_request ||
           this.job.duration ||
@@ -115,6 +124,12 @@
           :value="queued"
         />
         <detail-row
+          class="js-job-timeout"
+          v-if="job.timeout"
+          title="Timeout"
+          :value="timeout"
+        />
+        <detail-row
           class="js-job-runner"
           v-if="job.runner"
           title="Runner"
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 61a0ef08dde..3072817f443 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -6,6 +6,7 @@ module Ci
     include ObjectStorage::BackgroundMove
     include Presentable
     include Importable
+    include ChronicDurationAttribute
 
     MissingDependenciesError = Class.new(StandardError)
 
@@ -90,6 +91,8 @@ module Ci
     after_commit :update_project_statistics_after_save, on: [:create, :update]
     after_commit :update_project_statistics, on: :destroy
 
+    chronic_duration_attribute_reader :used_timeout_user_readable, :used_timeout
+
     class << self
       # This is needed for url_for to work,
       # as the controller is JobsController
@@ -120,6 +123,10 @@ module Ci
       end
 
       after_transition pending: :running do |build|
+        build.used_timeout = build.timeout
+        build.timeout_source = build.should_use_runner_timeout? ? 'Runner' : 'Project'
+        build.save!
+
         build.run_after_commit do
           BuildHooksWorker.perform_async(id)
         end
@@ -232,15 +239,14 @@ module Ci
     end
 
     def timeout
-      return runner.maximum_job_timeout if should_use_runner_timeout
+      return runner.maximum_job_timeout if should_use_runner_timeout?
 
       project.build_timeout
     end
 
-    def should_use_runner_timeout
+    def should_use_runner_timeout?
       !runner.nil? && runner.defines_maximum_job_timeout? && runner.maximum_job_timeout < project.build_timeout
     end
-    private :should_use_runner_timeout
 
     def triggered_by?(current_user)
       user == current_user
diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb
index 69d46f5ec14..d1a4a9561d2 100644
--- a/app/serializers/build_details_entity.rb
+++ b/app/serializers/build_details_entity.rb
@@ -5,6 +5,11 @@ class BuildDetailsEntity < JobEntity
   expose :runner, using: RunnerEntity
   expose :pipeline, using: PipelineEntity
 
+  expose :timeout, if: -> (*) { !build.used_timeout.nil? } do |build|
+    { value: build.used_timeout_user_readable,
+      source: build.timeout_source }
+  end
+
   expose :erased_by, if: -> (*) { build.erased? }, using: UserEntity
   expose :erase_path, if: -> (*) { build.erasable? && can?(current_user, :erase_build, build) } do |build|
     erase_project_job_path(project, build)