diff --git a/lib/gitlab/ci/config/node/configurable.rb b/lib/gitlab/ci/config/node/configurable.rb index 2de82d40c9dad753c8e1f4c850ec3b0255d4ab39..fb3604edac260542a6015daeae9ba17b036dafba 100644 --- a/lib/gitlab/ci/config/node/configurable.rb +++ b/lib/gitlab/ci/config/node/configurable.rb @@ -25,7 +25,7 @@ module Gitlab private - def compose! + def compose!(_deps) self.class.nodes.each do |key, factory| factory .value(@config[key]) diff --git a/lib/gitlab/ci/config/node/entry.rb b/lib/gitlab/ci/config/node/entry.rb index 0c782c422b583d706b4ab33a9764bc2969ca1ef5..40ffa85d6da8bc443094b6601e324c7e2fab3899 100644 --- a/lib/gitlab/ci/config/node/entry.rb +++ b/lib/gitlab/ci/config/node/entry.rb @@ -20,11 +20,14 @@ module Gitlab @validator.validate(:new) end - def process! + def process!(deps = nil) return unless valid? - compose! - descendants.each(&:process!) + compose!(deps) + + descendants.each do |entry| + entry.process!(deps) + end end def leaf? @@ -76,7 +79,7 @@ module Gitlab private - def compose! + def compose!(_deps) end end end diff --git a/lib/gitlab/ci/config/node/global.rb b/lib/gitlab/ci/config/node/global.rb index ccd539fb0037cb43d2d39f70e2f5dd357ae19334..4d65309cf44725b03ef399dcb3963e2679d8afd6 100644 --- a/lib/gitlab/ci/config/node/global.rb +++ b/lib/gitlab/ci/config/node/global.rb @@ -36,9 +36,13 @@ module Gitlab helpers :before_script, :image, :services, :after_script, :variables, :stages, :types, :cache, :jobs + def process!(_deps = nil) + super(self) + end + private - def compose! + def compose!(_deps) super compose_jobs! diff --git a/lib/gitlab/ci/config/node/job.rb b/lib/gitlab/ci/config/node/job.rb index e84737acbb98e2f70d96a6895bb9a908949e9e1a..55f34b446e588a814f6b95db43433264c788ebe2 100644 --- a/lib/gitlab/ci/config/node/job.rb +++ b/lib/gitlab/ci/config/node/job.rb @@ -107,7 +107,7 @@ module Gitlab after_script: after_script } end - def compose! + def compose!(_deps) super if type_defined? && !stage_defined? diff --git a/lib/gitlab/ci/config/node/jobs.rb b/lib/gitlab/ci/config/node/jobs.rb index 51683c82ceb7565f742b5063fd2163ac5bc8c654..a2a8554ed19a4237ad2c84325f801a45cac8d286 100644 --- a/lib/gitlab/ci/config/node/jobs.rb +++ b/lib/gitlab/ci/config/node/jobs.rb @@ -28,7 +28,7 @@ module Gitlab private - def compose! + def compose!(_deps) @config.each do |name, config| node = hidden?(name) ? Node::HiddenJob : Node::Job