summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-07-20 11:02:00 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-07-20 11:02:00 +0200
commit2f620aa7116f504229be81c2465fead342a57292 (patch)
tree1c2415a13a569aef6b399b5fb5cfa739d9dabc74
parentd382ed5eb618b5719f4fbf705a47b00c98e7c5a6 (diff)
downloadgitlab-ce-2f620aa7116f504229be81c2465fead342a57292.tar.gz
Change auto-retry count to a correct value in docs
-rw-r--r--doc/ci/yaml/README.md4
-rw-r--r--spec/models/ci/build_spec.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 808a23df554..e12ef6e2685 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -1145,7 +1145,7 @@ case of a failure.
When a job fails, and has `retry` configured it is going to be processed again
up to the amount of times specified by the `retry` keyword.
-If `retry` is set to 3, and a job succeeds in a second run, it won't be retried
+If `retry` is set to 2, and a job succeeds in a second run (first retry), it won't be retried
again. `retry` value has to be a positive integer, equal or larger than 0, but
lower or equal to 2 (two retries maximum, three runs in total).
@@ -1154,7 +1154,7 @@ A simple example:
```yaml
test:
script: rspec
- retry: 3
+ retry: 2
```
## Git Strategy
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index acfc888d944..0b521d720f3 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -826,10 +826,10 @@ describe Ci::Build, :models do
describe '#retries_max' do
context 'when max retries value is defined' do
- subject { create(:ci_build, options: { retry: 3 }) }
+ subject { create(:ci_build, options: { retry: 1 }) }
it 'returns a number of configured max retries' do
- expect(subject.retries_max).to eq 3
+ expect(subject.retries_max).to eq 1
end
end