diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-03-06 08:43:25 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-03-06 08:43:25 +0000 |
| commit | a28045124f33c67068246df91d9c0ca17c3ad035 (patch) | |
| tree | ba8c56804c75734b02badaa3bbde6f67a8494186 /lib/api | |
| parent | 09634b980846c4d50879568f531bcff9b38cce3b (diff) | |
| parent | 03438886e1de94df6bd89471e67aa6347fd5fb2e (diff) | |
| download | gitlab-ce-a28045124f33c67068246df91d9c0ca17c3ad035.tar.gz | |
Merge branch 'feature/sm/add-check-sum-to-job-artifacts' into 'master'
Add checksum to ci_job_artifacts
Closes #43599
See merge request gitlab-org/gitlab-ce!17354
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/runner.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/runner.rb b/lib/api/runner.rb index 91cdc564002..7e6c33ec33d 100644 --- a/lib/api/runner.rb +++ b/lib/api/runner.rb @@ -204,6 +204,7 @@ module API optional 'file.path', type: String, desc: %q(path to locally stored body (generated by Workhorse)) optional 'file.name', type: String, desc: %q(real filename as send in Content-Disposition (generated by Workhorse)) optional 'file.type', type: String, desc: %q(real content type as send in Content-Type (generated by Workhorse)) + optional 'file.sha256', type: String, desc: %q(sha256 checksum of the file) optional 'metadata.path', type: String, desc: %q(path to locally stored body (generated by Workhorse)) optional 'metadata.name', type: String, desc: %q(filename (generated by Workhorse)) end @@ -224,7 +225,7 @@ module API expire_in = params['expire_in'] || Gitlab::CurrentSettings.current_application_settings.default_artifacts_expire_in - job.build_job_artifacts_archive(project: job.project, file_type: :archive, file: artifacts, expire_in: expire_in) + job.build_job_artifacts_archive(project: job.project, file_type: :archive, file: artifacts, file_sha256: params['file.sha256'], expire_in: expire_in) job.build_job_artifacts_metadata(project: job.project, file_type: :metadata, file: metadata, expire_in: expire_in) if metadata job.artifacts_expire_in = expire_in |