summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-07-07 15:06:05 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-07-07 15:10:39 +0200
commitf067202e9b7a4304ffb8d68408880f7eb7fc8b34 (patch)
treed678ea0e302b052fd34743cb566d869772a4cb95 /lib
parenta7ac2f74944430d75b090f78cd9c1cf1d24379f6 (diff)
downloadgitlab-ce-f067202e9b7a4304ffb8d68408880f7eb7fc8b34.tar.gz
Improve creating CI config entries for jobs config
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/ci/config/node/jobs.rb16
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/gitlab/ci/config/node/jobs.rb b/lib/gitlab/ci/config/node/jobs.rb
index d7d61ade36d..cba1fce4a4c 100644
--- a/lib/gitlab/ci/config/node/jobs.rb
+++ b/lib/gitlab/ci/config/node/jobs.rb
@@ -29,14 +29,18 @@ module Gitlab
private
- def create_node(key, value)
- job_node = key.to_s.start_with?('.') ? Node::HiddenJob : Node::Job
+ def create_node(name, config)
+ job_node(name).new(config, job_attributes(name))
+ end
- job_attributes = { key: key,
- parent: self,
- description: "#{key} job definition." }
+ def job_node(name)
+ name.to_s.start_with?('.') ? Node::HiddenJob : Node::Job
+ end
- job_node.new(value, attributes.merge(job_attributes))
+ def job_attributes(name)
+ @attributes.merge(key: name,
+ parent: self,
+ description: "#{name} job definition.")
end
end
end