Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ci

CHANGELOG

@@ -7,6 +7,7 @@ v7.10.0
 
 v7.9.2
   - [Security] Already existing projects should not be served by shared runners
+  - Ability to run deploy job without test jobs (every push will trigger deploy job)
 
 v7.9.1
   - [Security] Adding explicit is_shared parameter to runner

app/models/build.rb

@@ -118,7 +118,10 @@ def retry(build)
         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?

app/models/commit.rb

@@ -137,11 +137,9 @@ def retried_builds
   end
 
   def create_deploy_builds(ref)
-    if 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

app/services/create_commit_service.rb

@@ -48,6 +48,10 @@ def execute(project, params)
       commit.create_builds
     end
 
+    if commit.builds.empty?
+      commit.create_deploy_builds(ref)
+    end
+
     commit
   end
 end

spec/models/commit_spec.rb

@@ -159,19 +159,14 @@
   end
 
   describe "create_deploy_builds" do
-    before do
-      job = FactoryGirl.create :job, project: project
-      job1 = FactoryGirl.create :job, project: project
+    it "creates deploy build" do
       FactoryGirl.create :job, job_type: :deploy, project: project
-      FactoryGirl.create :build, commit: commit, status: :success, job: job
-      FactoryGirl.create :build, commit: commit, status: :success, job: job1
       project.reload
-    end
 
-    it "creates new build for deploy" do
       commit.create_deploy_builds(commit.ref)
+      commit.builds.reload
 
-      commit.builds.size.should == 3
+      commit.builds.size.should == 1
     end
   end
 end

spec/services/create_commit_service_spec.rb

@@ -20,5 +20,18 @@
 
       it { should be_false }
     end
+
+    context "deploy builds" do
+      it "calls create_deploy_builds if there are no builds" do
+        project.jobs.destroy_all
+        Commit.any_instance.should_receive(:create_deploy_builds)
+        service.execute(project, ref: 'refs/heads/master', before: '00000000', after: '31das312') 
+      end
+
+      it "does not call create_deploy_builds if there is build" do
+        Commit.any_instance.should_not_receive(:create_deploy_builds)
+        service.execute(project, ref: 'refs/heads/master', before: '00000000', after: '31das312') 
+      end
+    end
   end
 end