diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities.rb | 6 | ||||
| -rw-r--r-- | lib/api/job_artifacts.rb | 8 | ||||
| -rw-r--r-- | lib/api/runner.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/data_builder/pipeline.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/workhorse.rb | 2 | ||||
| -rw-r--r-- | lib/tasks/gitlab/artifacts/migrate.rake | 4 |
6 files changed, 14 insertions, 14 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 95b25d7351a..834f29ed863 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -1104,8 +1104,8 @@ module API end class Job < JobBasic - # artifacts_file is included in job_artifacts, but kept for backward compatibility (remove in api/v5) - expose :artifacts_file, using: JobArtifactFile, if: -> (job, opts) { job.artifacts? } + # artifacts_archive_file is included in job_artifacts, but kept for backward compatibility (remove in api/v5) + expose :artifacts_archive_file, using: JobArtifactFile, if: -> (job, opts) { job.artifacts_archive? } expose :job_artifacts, as: :artifacts, using: JobArtifact expose :runner, with: Runner expose :artifacts_expire_at @@ -1280,7 +1280,7 @@ module API class Dependency < Grape::Entity expose :id, :name, :token - expose :artifacts_file, using: JobArtifactFile, if: ->(job, _) { job.artifacts? } + expose :artifacts_archive_file, using: JobArtifactFile, if: ->(job, _) { job.artifacts_archive? } end class Response < Grape::Entity diff --git a/lib/api/job_artifacts.rb b/lib/api/job_artifacts.rb index 32379d7c8ab..38cf511eb36 100644 --- a/lib/api/job_artifacts.rb +++ b/lib/api/job_artifacts.rb @@ -28,7 +28,7 @@ module API builds = user_project.latest_successful_builds_for(params[:ref_name]) latest_build = builds.find_by!(name: params[:job]) - present_carrierwave_file!(latest_build.artifacts_file) + present_carrierwave_file!(latest_build.artifacts_archive_file) end desc 'Download the artifacts archive from a job' do @@ -43,7 +43,7 @@ module API build = find_build!(params[:job_id]) - present_carrierwave_file!(build.artifacts_file) + present_carrierwave_file!(build.artifacts_archive_file) end desc 'Download a specific file from artifacts archive' do @@ -57,7 +57,7 @@ module API authorize_read_builds! build = find_build!(params[:job_id]) - not_found! unless build.artifacts? + not_found! unless build.artifacts_archive? path = Gitlab::Ci::Build::Artifacts::Path .new(params[:artifact_path]) @@ -77,7 +77,7 @@ module API build = find_build!(params[:job_id]) authorize!(:update_build, build) - break not_found!(build) unless build.artifacts? + break not_found!(build) unless build.artifacts_archive? build.keep_artifacts! diff --git a/lib/api/runner.rb b/lib/api/runner.rb index c9931c2d603..e419ae77ec5 100644 --- a/lib/api/runner.rb +++ b/lib/api/runner.rb @@ -281,7 +281,7 @@ module API job.job_artifacts.build( project: job.project, file: metadata, - file_type: :metadata, + file_type: "#{params['artifact_type']}_metadata", file_format: :gzip, file_sha256: metadata.sha256, expire_in: expire_in) @@ -307,7 +307,7 @@ module API get '/:id/artifacts' do job = authenticate_job! - present_carrierwave_file!(job.artifacts_file, supports_direct_download: params[:direct_download]) + present_carrierwave_file!(job.artifacts_archive_file, supports_direct_download: params[:direct_download]) end end end diff --git a/lib/gitlab/data_builder/pipeline.rb b/lib/gitlab/data_builder/pipeline.rb index eb246d393a1..f2899c0afe0 100644 --- a/lib/gitlab/data_builder/pipeline.rb +++ b/lib/gitlab/data_builder/pipeline.rb @@ -43,8 +43,8 @@ module Gitlab manual: build.action?, user: build.user.try(:hook_attrs), runner: build.runner && runner_hook_attrs(build.runner), - artifacts_file: { - filename: build.artifacts_file.filename, + artifacts_archive_file: { + filename: build.artifacts_archive_file.filename, size: build.artifacts_size } } diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index a9629a92a50..425d92217a6 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -112,7 +112,7 @@ module Gitlab end def send_artifacts_entry(build, entry) - file = build.artifacts_file + file = build.artifacts_archive_file archive = file.file_storage? ? file.path : file.url params = { diff --git a/lib/tasks/gitlab/artifacts/migrate.rake b/lib/tasks/gitlab/artifacts/migrate.rake index bfca4bfb3f7..38eb0cbe35c 100644 --- a/lib/tasks/gitlab/artifacts/migrate.rake +++ b/lib/tasks/gitlab/artifacts/migrate.rake @@ -12,8 +12,8 @@ namespace :gitlab do .with_artifacts_stored_locally .find_each(batch_size: 10) do |build| begin - build.artifacts_file.migrate!(ObjectStorage::Store::REMOTE) - build.artifacts_metadata.migrate!(ObjectStorage::Store::REMOTE) + build.artifacts_archive_file.migrate!(ObjectStorage::Store::REMOTE) + build.artifacts_archive_metadata.migrate!(ObjectStorage::Store::REMOTE) logger.info("Transferred artifacts of #{build.id} of #{build.artifacts_size} to object storage") rescue => e |