diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-07-04 10:47:18 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-07-04 10:47:18 +0900 |
| commit | dd73f75ad5ad353d642333bb89e59efc011caeea (patch) | |
| tree | de60329e7e5b5d1bdf57651b848a7e293824baf2 /lib | |
| parent | e90e171997e144d2a34c2066ecf5a450d1736f06 (diff) | |
| download | gitlab-ce-extend-junit-keyword-ce.tar.gz | |
Revert persisting file_format in databaseextend-junit-keyword-ce
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/runner.rb | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/trace.rb | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/lib/api/runner.rb b/lib/api/runner.rb index 3f7960ca0df..9b1454e0340 100644 --- a/lib/api/runner.rb +++ b/lib/api/runner.rb @@ -234,7 +234,7 @@ module API optional 'artifact_type', type: String, desc: %q(Type of the artifact (`archive` or `junit`)), default: 'archive', values: Ci::JobArtifact.file_types.keys optional 'artifact_format', type: String, desc: %q(Format of the artifact (`zip` or `gzip`)), - default: 'zip', values: Ci::JobArtifact.file_formats.keys + default: 'zip', values: Ci::JobArtifact::ACCEPTABLE_FILE_FORMAT 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)) optional 'metadata.size', type: Integer, desc: %q(real size of metadata (generated by Workhorse)) @@ -257,7 +257,6 @@ module API Gitlab::CurrentSettings.current_application_settings.default_artifacts_expire_in artifact_type = params['artifact_type'] - artifact_format = params['artifact_format'] bad_request!("Already uploaded") if job.public_send("job_artifacts_#{artifact_type}") # rubocop:disable GitlabSecurity/PublicSend @@ -265,7 +264,6 @@ module API project: job.project, file: artifacts, file_type: artifact_type.to_sym, - file_format: artifact_format.to_sym, file_sha256: artifacts.sha256, expire_in: expire_in) @@ -274,7 +272,6 @@ module API project: job.project, file: metadata, file_type: :metadata, - file_format: :gzip, file_sha256: metadata.sha256, expire_in: expire_in) end diff --git a/lib/gitlab/ci/trace.rb b/lib/gitlab/ci/trace.rb index 37cd8a2d8f8..a52d71225bb 100644 --- a/lib/gitlab/ci/trace.rb +++ b/lib/gitlab/ci/trace.rb @@ -161,7 +161,6 @@ module Gitlab job.create_job_artifacts_trace!( project: job.project, file_type: :trace, - file_format: :raw, file: stream, file_sha256: Digest::SHA256.file(path).hexdigest) end |