refactoring of deploy job creationdeploy_without_tests

3 files changed, 10 insertions, 7 deletions

diff --git a/app/models/build.rb b/app/models/build.rb
index 0cecc19..fa0cb8f 100644
--- a/app/models/build.rb
+++ b/app/models/build.rb
@@ -118,7 +118,10 @@ class Build < ActiveRecord::Base
         WebHookService.new.build_end(build)
       end
 
-      build.commit.create_deploy_builds(build.ref)
+      if build.commit.success? && !build.job.deploy?
+        build.commit.create_deploy_builds(build.ref)
+      end
+
       project.execute_services(build)
 
       if project.coverage_enabled?
diff --git a/app/models/commit.rb b/app/models/commit.rb
index 32bd334..5f1aa92 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -137,11 +137,9 @@ class Commit < ActiveRecord::Base
   end
 
   def create_deploy_builds(ref)
-    if builds.empty? || (success? && !last_build.job.deploy?)
-      project.jobs.deploy.active.each do |job|
-        if job.run_for_ref?(ref)
-          create_build_from_job(job)
-        end
+    project.jobs.deploy.active.each do |job|
+      if job.run_for_ref?(ref)
+        create_build_from_job(job)
       end
     end
   end
diff --git a/app/services/create_commit_service.rb b/app/services/create_commit_service.rb
index 9c8906f..1d1d3dc 100644
--- a/app/services/create_commit_service.rb
+++ b/app/services/create_commit_service.rb
@@ -48,7 +48,9 @@ class CreateCommitService
       commit.create_builds
     end
 
-    commit.create_deploy_builds(ref)
+    if commit.builds.empty?
+      commit.create_deploy_builds(ref)
+    end
 
     commit
   end