Move parallelized node index to job options

2 files changed, 4 insertions, 3 deletions

diff --git a/lib/gitlab/ci/config/normalizer.rb b/lib/gitlab/ci/config/normalizer.rb
index 55efc7439c1..fc1efb67560 100644
--- a/lib/gitlab/ci/config/normalizer.rb
+++ b/lib/gitlab/ci/config/normalizer.rb
@@ -10,8 +10,8 @@ module Gitlab
               if config[:parallel]
                 total = config[:parallel]
                 names = parallelize_job_names(name, total)
-                parallelized_jobs[name] = names
-                Hash[names.collect { |job_name| [job_name.to_sym, config.merge(name: job_name)] }]
+                parallelized_jobs[name] = names.map(&:first)
+                Hash[names.collect { |job_name, index| [job_name.to_sym, config.merge(name: job_name, instance: index)] }]
               else
                 { name => config }
               end
@@ -39,7 +39,7 @@ module Gitlab
             jobs = []
 
             total.times do |idx|
-              jobs << "#{name} #{idx + 1}/#{total}"
+              jobs << ["#{name} #{idx + 1}/#{total}", idx + 1]
             end
 
             jobs
diff --git a/lib/gitlab/ci/yaml_processor.rb b/lib/gitlab/ci/yaml_processor.rb
index 4977fa2ae24..63b55c57913 100644
--- a/lib/gitlab/ci/yaml_processor.rb
+++ b/lib/gitlab/ci/yaml_processor.rb
@@ -51,6 +51,7 @@ module Gitlab
             environment: job[:environment],
             retry: job[:retry],
             parallel: job[:parallel],
+            instance: job[:instance],
             start_in: job[:start_in]
           }.compact }
       end