diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-11-07 10:38:05 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-11-07 10:38:05 +0000 |
| commit | 6f6cd4f43dfdab19c8cb1ac7a03cae268f12b206 (patch) | |
| tree | 514d15ed2eeb38a45ac7ceb820264d7e6392e58c /lib/gitlab/ci/yaml_processor.rb | |
| parent | b1fae097bdb54232ca56f11447ec895ea067c56c (diff) | |
| parent | 7366c319df12900e40dbed679feab146d1092d89 (diff) | |
| download | gitlab-ce-6f6cd4f43dfdab19c8cb1ac7a03cae268f12b206.tar.gz | |
Merge branch '21480-parallel-job-keyword-mvc' into 'master'
Resolve "`parallel` job keyword MVC"
Closes #21480
See merge request gitlab-org/gitlab-ce!22631
Diffstat (limited to 'lib/gitlab/ci/yaml_processor.rb')
| -rw-r--r-- | lib/gitlab/ci/yaml_processor.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/ci/yaml_processor.rb b/lib/gitlab/ci/yaml_processor.rb index 39a1b52e531..e6ec400e476 100644 --- a/lib/gitlab/ci/yaml_processor.rb +++ b/lib/gitlab/ci/yaml_processor.rb @@ -52,6 +52,8 @@ module Gitlab after_script: job[:after_script], environment: job[:environment], retry: job[:retry], + parallel: job[:parallel], + instance: job[:instance], start_in: job[:start_in] }.compact } end @@ -104,7 +106,7 @@ module Gitlab ## # Jobs # - @jobs = @ci_config.jobs + @jobs = Ci::Config::Normalizer.new(@ci_config.jobs).normalize_jobs @jobs.each do |name, job| # logical validation for job |