diff options
author | Matija Čupić <matteeyah@gmail.com> | 2018-11-05 15:53:37 +0100 |
---|---|---|
committer | Matija Čupić <matteeyah@gmail.com> | 2018-11-05 15:53:37 +0100 |
commit | 4b2b154c4e5ddfc397bc59f3a38b8f09d44903e5 (patch) | |
tree | 2fc6411dc1d25d483fbdad4d7b820a678bce7e8e /lib | |
parent | 5fd8933d97b694fb8ae6a57acaae8fb4e7922e73 (diff) | |
download | gitlab-ce-4b2b154c4e5ddfc397bc59f3a38b8f09d44903e5.tar.gz |
Refactor Gitlab::Ci::Config::Normalizer
Use Hash#each_with_object to manipulate job hashes.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/ci/config/normalizer.rb | 86 | ||||
-rw-r--r-- | lib/gitlab/ci/yaml_processor.rb | 2 |
2 files changed, 45 insertions, 43 deletions
diff --git a/lib/gitlab/ci/config/normalizer.rb b/lib/gitlab/ci/config/normalizer.rb index 0eae6b9770b..7bd0e08e817 100644 --- a/lib/gitlab/ci/config/normalizer.rb +++ b/lib/gitlab/ci/config/normalizer.rb @@ -4,54 +4,56 @@ module Gitlab module Ci class Config class Normalizer - def initialize(jobs_config) - @jobs_config = jobs_config - end - - def normalize_jobs - parallelized_jobs = parallelize_jobs - parallelize_dependencies(parallelized_jobs) - end + class << self + def normalize_jobs(jobs_config) + parallelized_jobs = extract_parallelized_jobs(jobs_config) + parallelized_config = parallelize_jobs(jobs_config, parallelized_jobs) + parallelize_dependencies(parallelized_config, parallelized_jobs) + end + + private + + def extract_parallelized_jobs(jobs_config) + parallelized_jobs = {} + + jobs_config.each do |job_name, config| + if config[:parallel] + parallelized_jobs[job_name] = parallelize_job_names(job_name, config[:parallel]) + end + end - private + parallelized_jobs + end - def parallelize_jobs - parallelized_jobs = {} + def parallelize_jobs(jobs_config, parallelized_jobs) + jobs_config.each_with_object({}) do |(job_name, config), hash| + if parallelized_jobs.keys.include?(job_name) + parallelized_jobs[job_name].each { |name, index| hash[name.to_sym] = config.merge(name: name, instance: index) } + else + hash[job_name] = config + end - @jobs_config = @jobs_config.map do |name, config| - if config[:parallel] - total = config[:parallel] - names = self.class.parallelize_job_names(name, total) - 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 } + hash end - end.reduce(:merge) - - parallelized_jobs - end - - def parallelize_dependencies(parallelized_jobs) - @jobs_config.map do |name, config| - if config[:dependencies] - deps = config[:dependencies].map do |dep| - if parallelized_jobs.keys.include?(dep.to_sym) - parallelized_jobs[dep.to_sym] - else - dep - end - end.flatten - - { name => config.merge(dependencies: deps) } - else - { name => config } + end + + def parallelize_dependencies(parallelized_config, parallelized_jobs) + parallelized_config.each_with_object({}) do |(job_name, config), hash| + intersection = config[:dependencies] & parallelized_jobs.keys.map(&:to_s) + if intersection && intersection.any? + deps = intersection.map { |dep| parallelized_jobs[dep.to_sym].map(&:first) }.flatten + hash[job_name] = config.merge(dependencies: deps) + else + hash[job_name] = config + end + + hash end - end.reduce(:merge) - end + end - def self.parallelize_job_names(name, total) - Array.new(total) { |index| ["#{name} #{index + 1}/#{total}", index + 1] } + def parallelize_job_names(name, total) + Array.new(total) { |index| ["#{name} #{index + 1}/#{total}", index + 1] } + end end end end diff --git a/lib/gitlab/ci/yaml_processor.rb b/lib/gitlab/ci/yaml_processor.rb index f65a4e198cc..63b55c57913 100644 --- a/lib/gitlab/ci/yaml_processor.rb +++ b/lib/gitlab/ci/yaml_processor.rb @@ -104,7 +104,7 @@ module Gitlab ## # Jobs # - @jobs = Ci::Config::Normalizer.new(@ci_config.jobs).normalize_jobs + @jobs = Ci::Config::Normalizer.normalize_jobs(@ci_config.jobs) @jobs.each do |name, job| # logical validation for job |