Commit 1f244284 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Fix build attributes test, see:

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9021#note_23782188

This is discovered by
https://gitlab.com/gitlab-org/gitlab-ce/builds/10815456

I removed `gl_project_id` and this is failing. I took some look,
realizing that:

* `trace` is duplicated in `attributes`
* `tag_list` is not included in `build.attributes`
* `artifacts_expire_at` is missing in `attributes`

So we need to:

* Remove duplicated `trace` in `attributes` (40 -> 39)
* Remove `tag_list` in `attributes` (39 -> 38)
* Add `artifacts_expire_at` to `attributes` (38 -> 39)
* Add `gl_project_id` to `attributes` (39 -> 40)
parent b596dd8f
module Ci module Ci
class RetryBuildService < ::BaseService class RetryBuildService < ::BaseService
CLONE_ATTRIBUTES = %i[pipeline ref tag options commands tag_list name CLONE_ATTRIBUTES = %i[pipeline ref tag options commands name
allow_failure stage stage_idx trigger_request allow_failure stage stage_idx trigger_request
yaml_variables when environment coverage_regex] yaml_variables when environment coverage_regex]
.freeze .freeze
REJECT_ATTRIBUTES = %i[id status user token coverage trace runner REJECT_ATTRIBUTES = %i[id status user token coverage trace runner
artifacts_file artifacts_metadata artifacts_size artifacts_expire_at artifacts_file
artifacts_metadata artifacts_size
created_at updated_at started_at finished_at created_at updated_at started_at finished_at
queued_at erased_by erased_at].freeze queued_at erased_by erased_at].freeze
IGNORE_ATTRIBUTES = %i[trace type lock_version project target_url IGNORE_ATTRIBUTES = %i[type lock_version project gl_project_id target_url
deploy job_id description].freeze deploy job_id description].freeze
def execute(build) def execute(build)
......
...@@ -12,7 +12,7 @@ describe Ci::RetryBuildService, :services do ...@@ -12,7 +12,7 @@ describe Ci::RetryBuildService, :services do
shared_examples 'build duplication' do shared_examples 'build duplication' do
let(:build) do let(:build) do
create(:ci_build, :failed, :artifacts, :erased, :trace, create(:ci_build, :failed, :artifacts_expired, :erased, :trace,
:queued, :coverage, pipeline: pipeline) :queued, :coverage, pipeline: pipeline)
end end
...@@ -38,7 +38,7 @@ describe Ci::RetryBuildService, :services do ...@@ -38,7 +38,7 @@ describe Ci::RetryBuildService, :services do
described_class::IGNORE_ATTRIBUTES + described_class::IGNORE_ATTRIBUTES +
described_class::REJECT_ATTRIBUTES described_class::REJECT_ATTRIBUTES
expect(attributes.size).to eq build.attributes.size expect(build.attributes.size).to eq(attributes.size)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment