Merge branch 'receive-hostname' into 'master'

Receive hostname

Coordinator consumes Runner's hostname and uses it's as a description during registration.

This MR is required to make it work:
https://gitlab.com/gitlab-org/gitlab-ci-runner/merge_requests/10

See merge request !28

2 files changed, 9 insertions, 2 deletions

diff --git a/lib/api/runners.rb b/lib/api/runners.rb
index f8239a1..79d0b56 100644
--- a/lib/api/runners.rb
+++ b/lib/api/runners.rb
@@ -33,10 +33,10 @@ module API
         runner =
           if params[:token] == GitlabCi::REGISTRATION_TOKEN
             # Create shared runner. Requires admin access
-            Runner.create
+            Runner.create(description: params[:hostname])
           elsif project = Project.find_by(token: params[:token])
             # Create a specific runner for project.
-            project.runners.create
+            project.runners.create(description: params[:hostname])
           end
 
         return forbidden! unless runner
diff --git a/spec/requests/api/runners_spec.rb b/spec/requests/api/runners_spec.rb
index 7e35e5b..eb5e0ae 100644
--- a/spec/requests/api/runners_spec.rb
+++ b/spec/requests/api/runners_spec.rb
@@ -45,6 +45,13 @@ describe API::API do
       it { response.status.should == 201 }
     end
 
+    describe "should create a runner with description" do
+      before { post api("/runners/register"), token: GitlabCi::REGISTRATION_TOKEN, hostname: "server.hostname" }
+
+      it { response.status.should == 201 }
+      it { Runner.first.description.should == "server.hostname" }
+    end
+
     describe "should create a runner if project token provided" do
       let(:project) { FactoryGirl.create(:project) }
       before { post api("/runners/register"), token: project.token }