Merge branch 'better_yaml_validation_step2' into 'master'

Yaml refactoring and fixes

This refactoring also fixes some bugs with validation.

https://dev.gitlab.org/gitlab/gitlab-ci/issues/281

See merge request !152

1 files changed, 4 insertions, 8 deletions

diff --git a/app/models/commit.rb b/app/models/commit.rb
index 1d3f214..46900ab 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -94,12 +94,10 @@ class Commit < ActiveRecord::Base
   def create_builds
     return if skip_ci?
 
-    unless config_processor.valid?
-      save_yaml_error(config_processor.errors.join(",")) and return
-    end
-
     begin
       builds_for_ref = config_processor.builds_for_ref(ref, tag)
+    rescue GitlabCiYamlProcessor::ValidationError => e
+      save_yaml_error(e.message) and return
     rescue Exception => e
       logger.error e.message + "\n" + e.backtrace.join("\n")
       save_yaml_error("Undefined yaml error") and return
@@ -132,12 +130,10 @@ class Commit < ActiveRecord::Base
   def create_deploy_builds
     return if skip_ci?
 
-    unless config_processor.valid?
-      save_yaml_error(config_processor.errors.join(",")) and return
-    end
-
     begin
       deploy_builds_for_ref = config_processor.deploy_builds_for_ref(ref, tag)
+    rescue GitlabCiYamlProcessor::ValidationError => e
+      save_yaml_error(e.message) and return
     rescue Exception => e
       logger.error e.message + "\n" + e.backtrace.join("\n")
       save_yaml_error("Undefined yaml error") and return