diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-22 17:19:44 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-08-22 17:19:44 +0000 |
| commit | f41098adef6292020dae0b0134aa91820700f64f (patch) | |
| tree | a07356147d01df8761570d994416d94796aaac5d | |
| parent | 5bed13160e657089157eccb831002529ac729870 (diff) | |
| parent | bac55c346aea519eab30bf00ffa24553b7349891 (diff) | |
| download | gitlab-ce-f41098adef6292020dae0b0134aa91820700f64f.tar.gz | |
Merge branch 'fix/coverage-report-merge-time' into 'master'
Bump SimpleCov merge timeout to 365 days
## What does this MR do?
In case that CI pipeline fails because of intermittent errors in one of the jobs, when someone retries the only failing job located in the middle stage, the job that calculates compound coverage that is configured in later stage, and triggered after retrying job in the pipeline, will still return an accurate coverage value.
Closes #21144
See merge request !5932
| -rw-r--r-- | spec/simplecov_env.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/simplecov_env.rb b/spec/simplecov_env.rb index 6f8f7109e14..b507d38f472 100644 --- a/spec/simplecov_env.rb +++ b/spec/simplecov_env.rb @@ -1,4 +1,5 @@ require 'simplecov' +require 'active_support/core_ext/numeric/time' module SimpleCovEnv extend self @@ -48,7 +49,7 @@ module SimpleCovEnv add_group 'Uploaders', 'app/uploaders' add_group 'Validators', 'app/validators' - merge_timeout 7200 + merge_timeout 365.days end end end |