diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-01-10 10:50:19 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-01-10 10:50:19 +0300 |
| commit | 5f258b0cea1454e00cc65e6bd485af83baac05e6 (patch) | |
| tree | 0131ae5b3b1f37a59ec5aab877133b5ce67c8c27 /lib/gitlab | |
| parent | b2e807e62464a77dd9f4c50f4b339d4cd4f89718 (diff) | |
| parent | 09dc4956ad86877ec0112018fd05f311be1743cf (diff) | |
Merge branch '55628-artifacts-from-a-job-defined-after-a-parallel-job-are-not-downloaded' into 'master'
Resolve "Artifacts from a job defined after a `parallel` job are NOT downloaded"
Closes #55628
See merge request gitlab-org/gitlab-ce!24273
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/ci/config/normalizer.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/ci/config/normalizer.rb b/lib/gitlab/ci/config/normalizer.rb index b7743bd2090..191f5d09645 100644 --- a/lib/gitlab/ci/config/normalizer.rb +++ b/lib/gitlab/ci/config/normalizer.rb @@ -46,7 +46,8 @@ module Gitlab parallelized_job_names = @parallelized_jobs.keys.map(&:to_s) parallelized_config.each_with_object({}) do |(job_name, config), hash| if config[:dependencies] && (intersection = config[:dependencies] & parallelized_job_names).any? - deps = intersection.map { |dep| @parallelized_jobs[dep.to_sym].map(&:first) }.flatten + parallelized_deps = intersection.map { |dep| @parallelized_jobs[dep.to_sym].map(&:first) }.flatten + deps = config[:dependencies] - intersection + parallelized_deps hash[job_name] = config.merge(dependencies: deps) else hash[job_name] = config |