diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2019-04-16 13:06:52 +0200 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2019-04-16 13:06:52 +0200 |
| commit | 0cfa25ff21322d45aaef91fc7a3dd7c570632a05 (patch) | |
| tree | 11e9c6393808c22ecb0bfd3ccee945a39029145f /app/models/ci/job_artifact.rb | |
| parent | fc1dfae41c7e6e1bbaa95bc4a1e087ffddfcc57b (diff) | |
| download | gitlab-ce-0cfa25ff21322d45aaef91fc7a3dd7c570632a05.tar.gz | |
Backport changes from EE
This backports the changes from
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10452
Diffstat (limited to 'app/models/ci/job_artifact.rb')
| -rw-r--r-- | app/models/ci/job_artifact.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/models/ci/job_artifact.rb b/app/models/ci/job_artifact.rb index 99512a7c1dd..9695d49d18b 100644 --- a/app/models/ci/job_artifact.rb +++ b/app/models/ci/job_artifact.rb @@ -21,7 +21,8 @@ module Ci container_scanning: 'gl-container-scanning-report.json', dast: 'gl-dast-report.json', license_management: 'gl-license-management-report.json', - performance: 'performance.json' + performance: 'performance.json', + metrics: 'metrics.txt' }.freeze TYPE_AND_FORMAT_PAIRS = { @@ -29,6 +30,7 @@ module Ci metadata: :gzip, trace: :raw, junit: :gzip, + metrics: :gzip, # All these file formats use `raw` as we need to store them uncompressed # for Frontend to fetch the files and do analysis @@ -88,7 +90,8 @@ module Ci dast: 8, ## EE-specific codequality: 9, ## EE-specific license_management: 10, ## EE-specific - performance: 11 ## EE-specific + performance: 11, ## EE-specific + metrics: 12 ## EE-specific } enum file_format: { |