diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-27 20:50:24 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-01-27 20:50:24 +0000 |
| commit | 40403c78ef1677a8ce048f4de78d3de32ef81797 (patch) | |
| tree | b69dbf3a3bc4a36d24ad5fc09b6316374230ee20 /lib/ci/api/helpers.rb | |
| parent | 56538f9cc144c5149c412b5cf1e41e386c6441e1 (diff) | |
| parent | 95d2f0fb51de2c5800d41b7c4f285ed533ffe21a (diff) | |
| download | gitlab-ce-40403c78ef1677a8ce048f4de78d3de32ef81797.tar.gz | |
Merge branch 'fix-ci-runners-version-update' into 'master'
Fix CI runner version not being properly updated when asked for a build
Due to broken implementation of attribute_for_keys the runner information was not updated correctly.
This MR adds test to check that such scenario will never happen again.
See merge request !2618
Diffstat (limited to 'lib/ci/api/helpers.rb')
| -rw-r--r-- | lib/ci/api/helpers.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/ci/api/helpers.rb b/lib/ci/api/helpers.rb index 1c91204e98c..199d62d9b8a 100644 --- a/lib/ci/api/helpers.rb +++ b/lib/ci/api/helpers.rb @@ -34,10 +34,14 @@ module Ci @runner ||= Runner.find_by_token(params[:token].to_s) end - def update_runner_info + def get_runner_version_from_params return unless params["info"].present? - info = attributes_for_keys(["name", "version", "revision", "platform", "architecture"], params["info"]) - current_runner.update(info) + attributes_for_keys(["name", "version", "revision", "platform", "architecture"], params["info"]) + end + + def update_runner_info + current_runner.assign_attributes(get_runner_version_from_params) + current_runner.save if current_runner.changed? end def max_artifacts_size |