diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-06-22 12:22:53 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-06-22 12:22:53 +0300 |
commit | 05ce8a118743a5d896b6b8cc99b40af214ac8cd1 (patch) | |
tree | 8ddad8e7a7c75c274404c62d3ed583ad1a0c0b71 /lib/ci | |
parent | 04ecfca386b70800d3876d3f11ff7451e95d9087 (diff) |
Handle CI environment variables in a new CI config
Diffstat (limited to 'lib/ci')
-rw-r--r-- | lib/ci/gitlab_ci_yaml_processor.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb index c0f2a258836..436b0127c3d 100644 --- a/lib/ci/gitlab_ci_yaml_processor.rb +++ b/lib/ci/gitlab_ci_yaml_processor.rb @@ -67,9 +67,9 @@ module Ci @image = @ci_config.image @after_script = @ci_config.after_script @services = @ci_config.services + @variables = @ci_config.variables @stages = @config[:stages] || @config[:types] - @variables = @config[:variables] || {} @cache = @config[:cache] @jobs = {} @@ -126,10 +126,6 @@ module Ci raise ValidationError, "stages should be an array of strings" end - unless @variables.nil? || validate_variables(@variables) - raise ValidationError, "variables should be a map of key-value strings" - end - validate_global_cache! if @cache end |