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

CHANGELOG

+v5.2.0
+  - Add RUNNER_DESCRIPTION and RUNNER_TAG_LIST that can be send during runner's registration
+
 v5.1.0
   - Add `-C` command-line option to specify the working directory

README.md

@@ -115,6 +115,8 @@ You can tell `bin/setup` to use a different directory with the `-C` switch.
 bin/setup -C /my/runner/working/directory
 ```
+You can also specify RUNNER_DESCRIPTION and RUNNER_TAG_LIST during setup.
+
 #### Create an Upstart job (Ubuntu, Centos 6)
 ```

VERSION

-v5.0.0
+v5.2.0

lib/network.rb

@@ -73,9 +73,11 @@ module GitlabCi
       :failure
     end
-    def register_runner(token)
+    def register_runner(token, description, tag_list)
       body = {
-        token: token
+        token: token,
+        tag_list: tag_list,
+        description: description
       }
       opts = {

lib/setup.rb

@@ -26,13 +26,16 @@ module GitlabCi
       until registered
         token = ENV['REGISTRATION_TOKEN']
+        description = ENV['RUNNER_DESCRIPTION'] || Socket.gethostname
+        tag_list = ENV['RUNNER_TAG_LIST']
+
         unless token
           puts 'Please enter the gitlab-ci token for this runner: '
           token = gets.chomp
         end
-        puts "Registering runner with registration token: #{token}, url: #{Config.new.url}."
-        runner = Network.new.register_runner(token)
+        puts "Registering runner as #{description} with registration token: #{token}, url: #{Config.new.url}."
+        runner = Network.new.register_runner(token, description, tag_list)
         if runner
           write_token(runner[:token])