diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-01-26 19:25:48 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-01-27 12:04:54 +0100 |
| commit | 95d2f0fb51de2c5800d41b7c4f285ed533ffe21a (patch) | |
| tree | 3317b00e06c46c10fa5af8873b2bec218b08b407 /lib/ci/api/helpers.rb | |
| parent | 5e0ee54c6c89a4080e441c4407bb1087f5630040 (diff) | |
| download | gitlab-ce-95d2f0fb51de2c5800d41b7c4f285ed533ffe21a.tar.gz | |
Fix CI runner version not being properly updated when asking for a buildfix-ci-runners-version-update
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.
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 |