diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-01-29 18:00:53 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-02-06 15:50:08 +0900 |
| commit | edc936cde2730bb7c417343c582f2b8cf5b571c3 (patch) | |
| tree | 150b8d8798e30d7d85031d478e135821802a906c | |
| parent | 93386411a0e304293a962f123d84d127fecd6ffb (diff) | |
| download | gitlab-ce-edc936cde2730bb7c417343c582f2b8cf5b571c3.tar.gz | |
Fix inital test failures
| -rw-r--r-- | app/services/ci/create_trace_artifact_service.rb | 10 | ||||
| -rw-r--r-- | spec/services/ci/retry_build_service_spec.rb | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/app/services/ci/create_trace_artifact_service.rb b/app/services/ci/create_trace_artifact_service.rb index a92ce1a4d52..280a2c3afa4 100644 --- a/app/services/ci/create_trace_artifact_service.rb +++ b/app/services/ci/create_trace_artifact_service.rb @@ -4,10 +4,12 @@ module Ci return if job.job_artifacts_trace job.trace.read do |stream| - job.create_job_artifacts_trace!( - project: job.project, - file_type: :trace, - file: stream) if stream.file? + if stream.file? + job.create_job_artifacts_trace!( + project: job.project, + file_type: :trace, + file: stream) + end end end end diff --git a/spec/services/ci/retry_build_service_spec.rb b/spec/services/ci/retry_build_service_spec.rb index a06397a0782..f0681386b75 100644 --- a/spec/services/ci/retry_build_service_spec.rb +++ b/spec/services/ci/retry_build_service_spec.rb @@ -17,7 +17,8 @@ describe Ci::RetryBuildService do %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 auto_canceled_by job_artifacts job_artifacts_archive job_artifacts_metadata].freeze + erased_at auto_canceled_by job_artifacts job_artifacts_archive + job_artifacts_metadata job_artifacts_trace].freeze IGNORE_ACCESSORS = %i[type lock_version target_url base_tags trace_sections |