summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2017-03-03 10:17:20 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2017-03-03 10:17:20 +0000
commit859a9cd9a65a2b862145efafd8716613fda29cd7 (patch)
treeaa1f977cccdd185cf1a8fccf28fc0ee580ccf0d8 /app
parentb18646040c9b17c69ac66fb687b02450e161808c (diff)
parentf0ba1ea3c1157d9aae472872481982ac53fb90a8 (diff)
downloadgitlab-ce-859a9cd9a65a2b862145efafd8716613fda29cd7.tar.gz
Merge branch 'fix/gb/fix-build-retry-tags-assignment' into 'master'
Fix runner tags assignment when retrying a job Closes #28846 See merge request !9612
Diffstat (limited to 'app')
-rw-r--r--app/services/ci/retry_build_service.rb19
1 files changed, 5 insertions, 14 deletions
diff --git a/app/services/ci/retry_build_service.rb b/app/services/ci/retry_build_service.rb
index 38ef323f6e5..89da05b72bb 100644
--- a/app/services/ci/retry_build_service.rb
+++ b/app/services/ci/retry_build_service.rb
@@ -1,18 +1,9 @@
module Ci
class RetryBuildService < ::BaseService
- CLONE_ATTRIBUTES = %i[pipeline project ref tag options commands name
- allow_failure stage stage_idx trigger_request
- yaml_variables when environment coverage_regex]
- .freeze
-
- REJECT_ATTRIBUTES = %i[id status user token coverage trace runner
- artifacts_expire_at artifacts_file
- artifacts_metadata artifacts_size
- created_at updated_at started_at finished_at
- queued_at erased_by erased_at].freeze
-
- IGNORE_ATTRIBUTES = %i[type lock_version gl_project_id target_url
- deploy job_id description].freeze
+ CLONE_ACCESSORS = %i[pipeline project ref tag options commands name
+ allow_failure stage stage_idx trigger_request
+ yaml_variables when environment coverage_regex
+ description tag_list].freeze
def execute(build)
reprocess(build).tap do |new_build|
@@ -31,7 +22,7 @@ module Ci
raise Gitlab::Access::AccessDeniedError
end
- attributes = CLONE_ATTRIBUTES.map do |attribute|
+ attributes = CLONE_ACCESSORS.map do |attribute|
[attribute, build.send(attribute)]
end