Fixed builds for specific runners

CHANGELOG

@@ -6,6 +6,7 @@ v5.4
   - Fix schedule_builds rake task
   - Fix test webhook button
   - Job can be branch specific or tag specifi or both
+  - Shared runners builds projects which are not assigned to specific ones
 
 v5.3
   - Remove annoying 'Done' message from schedule_builds cron job

app/helpers/projects_helper.rb

@@ -22,4 +22,16 @@ def html_badge_code(project, ref)
     url = status_project_url(project, ref: ref, format: 'png')
     "<a href='#{project_url(project, ref: ref)}'><img src='#{url}' /></a>"
   end
+
+  def runners_for_project(project)
+    project.runners.map { |r| "#" + r.id.to_s }.join(", ")
+  end
+
+  def project_uses_specific_runner?(project)
+    project.runners.any?
+  end
+
+  def no_shared_runners_for_project?(project)
+    Runner.count.nonzero? && project.runners.blank? && Runner.shared.blank?
+  end
 end

app/models/runner.rb

@@ -20,6 +20,9 @@ class Runner < ActiveRecord::Base
 
   before_validation :set_default_values
 
+  scope :specific, ->() { where(id: RunnerProject.select(:runner_id)) }
+  scope :shared, ->() { where.not(id: RunnerProject.select(:runner_id)) }
+
   def set_default_values
     self.token = SecureRandom.hex(15) if self.token.blank?
   end

app/views/admin/runners/index.html.haml

@@ -23,10 +23,10 @@
     %ul
       %li
         %span.label.label-success shared
-        \- run any builds
+        \- run builds from all unassigned projects
       %li
         %span.label.label-info specific
-        \- run only builds from assigned projects
+        \- run builds from assigned projects
 
 
 

app/views/admin/runners/show.html.haml

@@ -9,12 +9,12 @@
 
 - if @runner.shared?
   .bs-callout.bs-callout-success
-    %h4 This runner will process build from ALL projects
+    %h4 This runner will process build from ALL UNASSIGNED projects
     %p If you want runner to build only specific projects you just need to enable them in table below
 - else
   .bs-callout.bs-callout-info
     %h4 This runner will process build only from ASSIGNED projects
-    %p If you want runner to build all projects you just need to disable all assignee projects
+    %p If you want runner to build unassigned projects you just need to disable all assignee projects
 .row
   .col-md-6
     %h4 Restrict projects for this runner

app/views/projects/_info.html.haml

@@ -0,0 +1,4 @@
+- if no_shared_runners_for_project?(@project)
+  = render 'no_shared_runners'
+- if project_uses_specific_runner?(@project)
+  = render 'specific_runner'

app/views/projects/_no_shared_runners.html.haml

@@ -0,0 +1,5 @@
+.alert.alert-danger
+  %p
+    There are NO runners to build this project. Consider assigning this project to a
+    %span.label.label-info specific
+    one or add the new runner.

app/views/projects/_specific_runner.html.haml

@@ -0,0 +1,6 @@
+.alert.alert-info
+  %p
+    This project uses a
+    %span.label.label-info specific
+    runner.
+    Builds will be run only by #{runners_for_project(@project)}.

app/views/projects/edit.html.haml

@@ -1 +1,2 @@
+= render 'info'
 = render 'form'

lib/api/builds.rb

@@ -15,8 +15,11 @@ class Builds < Grape::API
 
         ActiveRecord::Base.transaction do
           build = if current_runner.shared?
-                    Build.first_pending
+                    # don't run projects which are assigned to specific runners
+                    projects = RunnerProject.pluck(:project_id)
+                    Build.where.not(project_id: projects).first_pending
                   else
+                    # do run projects which are only assigned to this runner
                     commits = Commit.where(project_id: current_runner.projects)
                     Build.where(commit_id: commits).first_pending
                   end

spec/requests/api/builds_spec.rb

@@ -7,6 +7,9 @@
   let(:project) { FactoryGirl.create(:project) }
 
   describe "Builds API for runners" do
+    let(:shared_runner) { FactoryGirl.create(:runner, token: "SharedRunner") }
+    let(:shared_project) { FactoryGirl.create(:project, name: "SharedProject") }
+
     before do
       FactoryGirl.create :runner_project, project_id: project.id, runner_id: runner.id
     end
@@ -27,6 +30,24 @@
 
         response.status.should == 404
       end
+
+      it "should return 404 error if no builds for specific runner" do
+        commit = FactoryGirl.create(:commit, project: shared_project)
+        FactoryGirl.create(:build, commit: commit, status: 'pending' )
+
+        post api("/builds/register"), token: runner.token
+
+        response.status.should == 404
+      end
+
+      it "should return 404 error if no builds for shared runner" do
+        commit = FactoryGirl.create(:commit, project: project)
+        FactoryGirl.create(:build, commit: commit, status: 'pending' )
+
+        post api("/builds/register"), token: shared_runner.token
+
+        response.status.should == 404
+      end
     end
 
     describe "PUT /builds/:id" do