Commit b7946b50 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Read job variables directly from gitlab CI config

parent b578fbfb
...@@ -381,9 +381,13 @@ module Ci ...@@ -381,9 +381,13 @@ module Ci
end end
def job_yaml_variables def job_yaml_variables
options[:variables].to_h.map do |key, value| if commit.config_processor
commit.config_processor.job_variables(name).map do |key, value|
{ key: key, value: value, public: true } { key: key, value: value, public: true }
end end
else
[]
end
end end
def project_variables def project_variables
......
...@@ -9,7 +9,7 @@ module Ci ...@@ -9,7 +9,7 @@ module Ci
:allow_failure, :type, :stage, :when, :artifacts, :cache, :allow_failure, :type, :stage, :when, :artifacts, :cache,
:dependencies, :variables] :dependencies, :variables]
attr_reader :before_script, :image, :services, :variables, :path, :cache attr_reader :before_script, :image, :services, :path, :cache
def initialize(config, path = nil) def initialize(config, path = nil)
@config = YAML.safe_load(config, [Symbol], [], true) @config = YAML.safe_load(config, [Symbol], [], true)
...@@ -40,6 +40,15 @@ module Ci ...@@ -40,6 +40,15 @@ module Ci
@stages || DEFAULT_STAGES @stages || DEFAULT_STAGES
end end
def variables
@variables
end
def job_variables(name)
job = @jobs[name.to_sym]
job ? job[:variables] : []
end
private private
def initial_parsing def initial_parsing
...@@ -85,7 +94,6 @@ module Ci ...@@ -85,7 +94,6 @@ module Ci
artifacts: job[:artifacts], artifacts: job[:artifacts],
cache: job[:cache] || @cache, cache: job[:cache] || @cache,
dependencies: job[:dependencies], dependencies: job[:dependencies],
variables: job[:variables],
}.compact }.compact
} }
end end
......
...@@ -374,10 +374,10 @@ module Ci ...@@ -374,10 +374,10 @@ module Ci
}) })
end end
it 'appends job variable to job attributes' do it 'returns job variables' do
config = GitlabCiYamlProcessor.new(yaml_config, path) config = GitlabCiYamlProcessor.new(yaml_config, path)
expect(config.builds.first[:options][:variables]).to eq job_variables expect(config.job_variables(:rspec)).to eq job_variables
end end
end end
end end
......
...@@ -240,31 +240,27 @@ describe Ci::Build, models: true do ...@@ -240,31 +240,27 @@ describe Ci::Build, models: true do
end end
context 'when job variables are defined' do context 'when job variables are defined' do
def result_variables
job_variables.map do |key, value|
{ key: key, value: value, public: true }
end
end
before { build.update_attribute(:options, variables: job_variables) }
context 'when job variables are unique' do context 'when job variables are unique' do
let(:job_variables) { { KEY1: 'value1', KEY2: 'value2' } } before { allow(build).to receive(:name) { 'staging' } }
it 'includes job variables' do it 'includes job variables' do
expect(subject).to include(*result_variables) expect(subject).to include(
{ key: :KEY1, value: 'value1', public: true },
{ key: :KEY2, value: 'value2', public: true }
)
end end
end end
context 'when job variable has same key other variable has' do context 'when job variable has same key other variable has' do
let(:job_variables) { { CI_BUILD_NAME: 'overridden' } } before { allow(build).to receive(:name) { 'production' } }
it 'contains job yaml variable' do it 'contains job yaml variable' do
expect(subject).to include(*result_variables) expect(subject).to include(key: :DB_NAME, value: 'mysql',
public: true)
end end
it 'contains only one variable with this key' do it 'contains only one variable with this key' do
expect(subject.count { |var| var[:key] == :CI_BUILD_NAME } ).to eq 1 expect(subject.count { |var| var[:key] == :DB_NAME } ).to eq 1
end end
end end
end end
......
...@@ -33,6 +33,9 @@ spinach: ...@@ -33,6 +33,9 @@ spinach:
- tags - tags
staging: staging:
variables:
KEY1: value1
KEY2: value2
script: "cap deploy stating" script: "cap deploy stating"
type: deploy type: deploy
tags: tags:
...@@ -42,6 +45,8 @@ staging: ...@@ -42,6 +45,8 @@ staging:
- stable - stable
production: production:
variables:
DB_NAME: mysql
type: deploy type: deploy
script: script:
- cap deploy production - cap deploy production
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment