diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-06-06 12:23:27 +0200 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-06-06 20:56:58 +0200 |
commit | 940763e0e72a7f71c6e60f2a1a848f8fe4afaf33 (patch) | |
tree | 6aa27cc1175ab3d41f69aaa250e3c34a9db71efb /lib/ci/gitlab_ci_yaml_processor.rb | |
parent | a3c0745514ad98df1fbb8a6142f6cc50df76edae (diff) | |
download | gitlab-ce-940763e0e72a7f71c6e60f2a1a848f8fe4afaf33.tar.gz |
Use CI config errors from new processor in legacy one
Diffstat (limited to 'lib/ci/gitlab_ci_yaml_processor.rb')
-rw-r--r-- | lib/ci/gitlab_ci_yaml_processor.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb index e470ec56b79..4bd2ac4f2db 100644 --- a/lib/ci/gitlab_ci_yaml_processor.rb +++ b/lib/ci/gitlab_ci_yaml_processor.rb @@ -14,7 +14,9 @@ module Ci attr_reader :before_script, :after_script, :image, :services, :path, :cache def initialize(config, path = nil) - @config = Gitlab::Ci::Config.new(config).to_hash + @ci_config = Gitlab::Ci::Config.new(config) + @config = @ci_config.to_hash + @path = path initial_parsing @@ -99,6 +101,10 @@ module Ci end def validate! + unless @ci_config.valid? + raise ValidationError, @ci_config.errors.first + end + validate_global! @jobs.each do |name, job| @@ -109,10 +115,6 @@ module Ci end def validate_global! - unless validate_array_of_strings(@before_script) - raise ValidationError, "before_script should be an array of strings" - end - unless @after_script.nil? || validate_array_of_strings(@after_script) raise ValidationError, "after_script should be an array of strings" end |