summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2018-10-27 19:06:46 +0200
committerMatija Čupić <matteeyah@gmail.com>2018-10-27 19:06:46 +0200
commit9ba72fe09aaf3bf903494f09fe8896012e962c98 (patch)
tree29597094f94719bed139a7792e1289abbd5967d1
parentff1795713e7029e40b11888debe577294dd9754f (diff)
downloadgitlab-ce-9ba72fe09aaf3bf903494f09fe8896012e962c98.tar.gz
Change minimum parallel value to 2
-rw-r--r--lib/gitlab/ci/config/entry/job.rb2
-rw-r--r--spec/lib/gitlab/ci/config/entry/job_spec.rb6
-rw-r--r--spec/lib/gitlab/ci/yaml_processor_spec.rb4
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/gitlab/ci/config/entry/job.rb b/lib/gitlab/ci/config/entry/job.rb
index 368b5eb2a89..c73c88583b0 100644
--- a/lib/gitlab/ci/config/entry/job.rb
+++ b/lib/gitlab/ci/config/entry/job.rb
@@ -28,7 +28,7 @@ module Gitlab
greater_than_or_equal_to: 0,
less_than_or_equal_to: 2 }
validates :parallel, numericality: { only_integer: true,
- greater_than_or_equal_to: 1 }
+ greater_than_or_equal_to: 2 }
validates :when,
inclusion: { in: %w[on_success on_failure always manual delayed],
message: 'should be on_success, on_failure, ' \
diff --git a/spec/lib/gitlab/ci/config/entry/job_spec.rb b/spec/lib/gitlab/ci/config/entry/job_spec.rb
index 718098c364e..f1a2946acda 100644
--- a/spec/lib/gitlab/ci/config/entry/job_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/job_spec.rb
@@ -147,13 +147,13 @@ describe Gitlab::Ci::Config::Entry::Job do
end
end
- context 'when it is lower than one' do
- let(:config) { { parallel: 0 } }
+ context 'when it is lower than two' do
+ let(:config) { { parallel: 1 } }
it 'returns error about value too low' do
expect(entry).not_to be_valid
expect(entry.errors)
- .to include 'job parallel must be greater than or equal to 1'
+ .to include 'job parallel must be greater than or equal to 2'
end
end
diff --git a/spec/lib/gitlab/ci/yaml_processor_spec.rb b/spec/lib/gitlab/ci/yaml_processor_spec.rb
index 544e421d571..8289a6b000b 100644
--- a/spec/lib/gitlab/ci/yaml_processor_spec.rb
+++ b/spec/lib/gitlab/ci/yaml_processor_spec.rb
@@ -141,11 +141,11 @@ module Gitlab
context 'when parallel is defined' do
let(:config) do
YAML.dump(rspec: { script: 'rspec',
- parallel: 1 })
+ parallel: 2 })
end
it 'has the attributes' do
- expect(subject[:options][:parallel]).to eq 1
+ expect(subject[:options][:parallel]).to eq 2
end
end
end