Use variables collection as build predefined variables

2 files changed, 8 insertions, 2 deletions

diff --git a/lib/gitlab/ci/variables/collection.rb b/lib/gitlab/ci/variables/collection.rb
index 83db5492d43..ae7415fcdb1 100644
--- a/lib/gitlab/ci/variables/collection.rb
+++ b/lib/gitlab/ci/variables/collection.rb
@@ -7,13 +7,17 @@ module Gitlab
         def initialize(variables = [])
           @variables = []
 
-          variables.each { |variable| append(variable) }
+          variables.each { |variable| self.append(variable) }
         end
 
         def append(resource)
           @variables.append(Collection::Item.fabricate(resource))
         end
 
+        def concat(resources)
+          resources.each { |variable| self.append(variable) }
+        end
+
         def each
           @variables.each { |variable| yield variable }
         end
diff --git a/lib/gitlab/ci/variables/collection/item.rb b/lib/gitlab/ci/variables/collection/item.rb
index 4de96e97417..c238ac8f18e 100644
--- a/lib/gitlab/ci/variables/collection/item.rb
+++ b/lib/gitlab/ci/variables/collection/item.rb
@@ -33,10 +33,12 @@ module Gitlab
               self.new(resource)
             when ::Ci::Variable
               self.new(resource.to_hash)
+            when ::Ci::PipelineVariable
+              self.new(resource.to_hash)
             when self
               resource.dup
             else
-              raise ArgumentError, 'Unknown CI/CD variable resource!'
+              raise ArgumentError, "Unknown `#{resource.class}` variable resource!"
             end
           end
         end