Commit 47fa9f33 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Move job variables config entry to new CI config

parent 1bf9e347
...@@ -106,7 +106,6 @@ module Ci ...@@ -106,7 +106,6 @@ module Ci
validate_job_types!(name, job) validate_job_types!(name, job)
validate_job_stage!(name, job) if job[:stage] validate_job_stage!(name, job) if job[:stage]
validate_job_variables!(name, job) if job[:variables]
validate_job_artifacts!(name, job) if job[:artifacts] validate_job_artifacts!(name, job) if job[:artifacts]
validate_job_dependencies!(name, job) if job[:dependencies] validate_job_dependencies!(name, job) if job[:dependencies]
end end
...@@ -124,14 +123,6 @@ module Ci ...@@ -124,14 +123,6 @@ module Ci
raise ValidationError, "#{name} job: tags parameter should be an array of strings" raise ValidationError, "#{name} job: tags parameter should be an array of strings"
end end
if job[:only] && !validate_array_of_strings_or_regexps(job[:only])
raise ValidationError, "#{name} job: only parameter should be an array of strings or regexps"
end
if job[:except] && !validate_array_of_strings_or_regexps(job[:except])
raise ValidationError, "#{name} job: except parameter should be an array of strings or regexps"
end
if job[:allow_failure] && !validate_boolean(job[:allow_failure]) if job[:allow_failure] && !validate_boolean(job[:allow_failure])
raise ValidationError, "#{name} job: allow_failure parameter should be an boolean" raise ValidationError, "#{name} job: allow_failure parameter should be an boolean"
end end
...@@ -151,13 +142,6 @@ module Ci ...@@ -151,13 +142,6 @@ module Ci
end end
end end
def validate_job_variables!(name, job)
unless validate_variables(job[:variables])
raise ValidationError,
"#{name} job: variables should be a map of key-value strings"
end
end
def validate_job_artifacts!(name, job) def validate_job_artifacts!(name, job)
job[:artifacts].keys.each do |key| job[:artifacts].keys.each do |key|
unless ALLOWED_ARTIFACTS_KEYS.include? key unless ALLOWED_ARTIFACTS_KEYS.include? key
......
...@@ -44,8 +44,11 @@ module Gitlab ...@@ -44,8 +44,11 @@ module Gitlab
node :except, While, node :except, While,
description: 'Refs policy this job will be executed for.' description: 'Refs policy this job will be executed for.'
node :variables, Variables,
description: 'Environment variables available for this job.'
helpers :before_script, :script, :stage, :type, :after_script, helpers :before_script, :script, :stage, :type, :after_script,
:cache, :image, :services, :only, :except :cache, :image, :services, :only, :except, :variables
def name def name
@metadata[:name] @metadata[:name]
...@@ -67,6 +70,7 @@ module Gitlab ...@@ -67,6 +70,7 @@ module Gitlab
cache: cache, cache: cache,
only: only, only: only,
except: except, except: except,
variables: variables_defined? ? variables : nil,
after_script: after_script } after_script: after_script }
end end
......
...@@ -534,7 +534,7 @@ module Ci ...@@ -534,7 +534,7 @@ module Ci
expect { GitlabCiYamlProcessor.new(config, path) } expect { GitlabCiYamlProcessor.new(config, path) }
.to raise_error(GitlabCiYamlProcessor::ValidationError, .to raise_error(GitlabCiYamlProcessor::ValidationError,
/job: variables should be a map/) /jobs:rspec:variables config should be a hash of key value pairs/)
end end
end end
......
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