Add variables to pipeline expressions evaluator

2 files changed, 8 insertions, 1 deletions

diff --git a/lib/gitlab/ci/pipeline/expression/statement.rb b/lib/gitlab/ci/pipeline/expression/statement.rb
index 339bef66c45..21bd5414467 100644
--- a/lib/gitlab/ci/pipeline/expression/statement.rb
+++ b/lib/gitlab/ci/pipeline/expression/statement.rb
@@ -17,7 +17,10 @@ module Gitlab
           def initialize(statement, pipeline)
             @pipeline = pipeline
             @lexer = Expression::Lexer.new(statement)
-            @variables = pipeline.variables # TODO
+
+            @variables = pipeline.variables.map do |variable|
+              { variable.key => variable.value }
+            end
           end
 
           def tokens
diff --git a/spec/lib/gitlab/ci/pipeline/expression/statement_spec.rb b/spec/lib/gitlab/ci/pipeline/expression/statement_spec.rb
index 3d714a64a12..f7695a28ea6 100644
--- a/spec/lib/gitlab/ci/pipeline/expression/statement_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/expression/statement_spec.rb
@@ -8,6 +8,10 @@ describe Gitlab::Ci::Pipeline::Expression::Statement do
     described_class.new(text, pipeline)
   end
 
+  before do
+    pipeline.variables.build([key: 'VARIABLE', value: 'my variable'])
+  end
+
   describe '#tokens' do
     it 'returns raw tokens' do
       expect(subject.tokens.size).to eq 2