Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/ci/config/normalizer.rb')
-rw-r--r--lib/gitlab/ci/config/normalizer.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/ci/config/normalizer.rb b/lib/gitlab/ci/config/normalizer.rb
index 22fcd84c968..a5b692b26d6 100644
--- a/lib/gitlab/ci/config/normalizer.rb
+++ b/lib/gitlab/ci/config/normalizer.rb
@@ -44,6 +44,10 @@ module Gitlab
job_need_name = job_need[:name].to_sym
if all_jobs = parallelized_jobs[job_need_name]
+ if job_need.key?(:parallel)
+ all_jobs = parallelize_job_config(job_need_name, job_need.delete(:parallel))
+ end
+
all_jobs.map { |job| job_need.merge(name: job.name) }
else
job_need