Duplicate CI config node factory on class level

2 files changed, 6 insertions, 4 deletions

diff --git a/lib/gitlab/ci/config/node/configurable.rb b/lib/gitlab/ci/config/node/configurable.rb
index 650c6efba63..f2383e07aa7 100644
--- a/lib/gitlab/ci/config/node/configurable.rb
+++ b/lib/gitlab/ci/config/node/configurable.rb
@@ -37,7 +37,9 @@ module Gitlab
           end
 
           class_methods do
-            attr_reader :allowed_nodes
+            def allowed_nodes
+              Hash[@allowed_nodes.map { |key, factory| [key, factory.dup] } ]
+            end
 
             private
 
diff --git a/lib/gitlab/ci/config/node/entry.rb b/lib/gitlab/ci/config/node/entry.rb
index 2f327fa9bf3..e5692e72947 100644
--- a/lib/gitlab/ci/config/node/entry.rb
+++ b/lib/gitlab/ci/config/node/entry.rb
@@ -27,8 +27,8 @@ module Gitlab
           end
 
           def compose!
-            allowed_nodes.each do |key, factory|
-              @nodes[key] = create_node(key, factory.dup)
+            allowed_nodes.each do |key, essence|
+              @nodes[key] = create_node(key, essence)
             end
           end
 
@@ -62,7 +62,7 @@ module Gitlab
 
           private
 
-          def create_node(key, factory)
+          def create_node(key, essence)
             raise NotImplementedError
           end
         end