diff options
| author | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-02-26 18:51:56 +0100 |
|---|---|---|
| committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2018-03-28 13:57:17 +0200 |
| commit | 3e7f3bc7980018910f6c6e7a19f706ad18ab2793 (patch) | |
| tree | 0964f1577ea244062d88eae8e21c2db8f9e53641 /app/models | |
| parent | e75614e8cb391f0e499b71b261de7c8148f1b6a4 (diff) | |
| download | gitlab-ce-3e7f3bc7980018910f6c6e7a19f706ad18ab2793.tar.gz | |
Refactor timeout selection mechanism
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/ci/build.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index f47cbe0a206..f9a83965199 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -124,7 +124,7 @@ module Ci after_transition pending: :running do |build| build.used_timeout = build.timeout - build.timeout_source = build.should_use_runner_timeout? ? 'Runner' : 'Project' + build.timeout_source = build.timeout < build.project.build_timeout ? 'Runner' : 'Project' build.save! build.run_after_commit do @@ -239,13 +239,7 @@ module Ci end def timeout - return runner.maximum_job_timeout if should_use_runner_timeout? - - project.build_timeout - end - - def should_use_runner_timeout? - !runner.nil? && runner.defines_maximum_job_timeout? && runner.maximum_job_timeout < project.build_timeout + [project.build_timeout, runner&.maximum_job_timeout].compact.min end def triggered_by?(current_user) |