diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-07-12 13:29:21 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-07-12 13:29:21 +0900 |
| commit | da4ca63f25a27a1268317952061c81a28516653f (patch) | |
| tree | 1f84b06848fd10c4aee3cc644af007c51775b1cb | |
| parent | 4098a8f10f92a6efa48080f8925809e251066f9d (diff) | |
| download | gitlab-ce-da4ca63f25a27a1268317952061c81a28516653f.tar.gz | |
Refactor job_artifacts_metadata to job_artifacts_archive_metadata
| -rw-r--r-- | app/models/ci/build.rb | 2 | ||||
| -rw-r--r-- | app/models/concerns/artifact_migratable.rb | 6 | ||||
| -rw-r--r-- | spec/requests/api/runner_spec.rb | 2 | ||||
| -rw-r--r-- | spec/services/ci/retry_build_service_spec.rb | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 5419fbdcef7..8942fbe17f2 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -23,7 +23,7 @@ module Ci has_many :job_artifacts, class_name: 'Ci::JobArtifact', foreign_key: :job_id, dependent: :destroy, inverse_of: :job # rubocop:disable Cop/ActiveRecordDependent has_one :job_artifacts_archive, -> { where(file_type: Ci::JobArtifact.file_types[:archive]) }, class_name: 'Ci::JobArtifact', inverse_of: :job, foreign_key: :job_id - has_one :job_artifacts_metadata, -> { where(file_type: Ci::JobArtifact.file_types[:metadata]) }, class_name: 'Ci::JobArtifact', inverse_of: :job, foreign_key: :job_id + has_one :job_artifacts_archive_metadata, -> { where(file_type: Ci::JobArtifact.file_types[:metadata]) }, class_name: 'Ci::JobArtifact', inverse_of: :job, foreign_key: :job_id has_one :job_artifacts_trace, -> { where(file_type: Ci::JobArtifact.file_types[:trace]) }, class_name: 'Ci::JobArtifact', inverse_of: :job, foreign_key: :job_id has_one :job_artifacts_junit, -> { where(file_type: Ci::JobArtifact.file_types[:junit]) }, class_name: 'Ci::JobArtifact', inverse_of: :job, foreign_key: :job_id diff --git a/app/models/concerns/artifact_migratable.rb b/app/models/concerns/artifact_migratable.rb index ff52ca64459..5ce7d693249 100644 --- a/app/models/concerns/artifact_migratable.rb +++ b/app/models/concerns/artifact_migratable.rb @@ -7,7 +7,7 @@ module ArtifactMigratable end def artifacts_metadata - job_artifacts_metadata&.file || legacy_artifacts_metadata + job_artifacts_archive_metadata&.file || legacy_artifacts_metadata end def artifacts? @@ -31,8 +31,8 @@ module ArtifactMigratable end def remove_artifacts_metadata! - if job_artifacts_metadata - job_artifacts_metadata.destroy + if job_artifacts_archive_metadata + job_artifacts_archive_metadata.destroy else remove_legacy_artifacts_metadata! end diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb index d57993ab454..401ba7959bc 100644 --- a/spec/requests/api/runner_spec.rb +++ b/spec/requests/api/runner_spec.rb @@ -1380,7 +1380,7 @@ describe API::Runner, :clean_gitlab_redis_shared_state do let(:stored_metadata_file) { job.reload.artifacts_metadata.file } let(:stored_artifacts_size) { job.reload.artifacts_size } let(:stored_artifacts_sha256) { job.reload.job_artifacts_archive.file_sha256 } - let(:stored_metadata_sha256) { job.reload.job_artifacts_metadata.file_sha256 } + let(:stored_metadata_sha256) { job.reload.job_artifacts_archive_metadata.file_sha256 } before do post(api("/jobs/#{job.id}/artifacts"), post_data, headers_with_token) diff --git a/spec/services/ci/retry_build_service_spec.rb b/spec/services/ci/retry_build_service_spec.rb index ecf5d849d3f..41899740081 100644 --- a/spec/services/ci/retry_build_service_spec.rb +++ b/spec/services/ci/retry_build_service_spec.rb @@ -24,7 +24,7 @@ describe Ci::RetryBuildService do 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 job_artifacts_trace].freeze + job_artifacts_archive_metadata job_artifacts_trace].freeze IGNORE_ACCESSORS = %i[type lock_version target_url base_tags trace_sections |