diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-10-03 10:33:33 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-10-03 10:33:33 +0900 |
| commit | 41fe9edcf75a96db2f29c172828e6adf0ca5b0c9 (patch) | |
| tree | 905817422a31aafb8b4cc7981abaddf613f466e0 /app/models/ci | |
| parent | e5e307dd75f74c5e98b039332c58170dc9c2735f (diff) | |
| parent | 42822a7d45f063804fe04f44e15cf04549460ae7 (diff) | |
| download | gitlab-ce-41fe9edcf75a96db2f29c172828e6adf0ca5b0c9.tar.gz | |
Merge branch 'master-ce' into scheduled-manual-jobs
Diffstat (limited to 'app/models/ci')
| -rw-r--r-- | app/models/ci/build.rb | 7 | ||||
| -rw-r--r-- | app/models/ci/job_artifact.rb | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 4f1f5d047a3..8f1547463ba 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -560,6 +560,13 @@ module Ci self.job_artifacts.update_all(expire_at: nil) end + def artifacts_file_for_type(type) + file = job_artifacts.find_by(file_type: Ci::JobArtifact.file_types[type])&.file + # TODO: to be removed once legacy artifacts is removed + file ||= legacy_artifacts_file if type == :archive + file + end + def coverage_regex super || project.try(:build_coverage_regex) end diff --git a/app/models/ci/job_artifact.rb b/app/models/ci/job_artifact.rb index 259d85e2fe5..cb73fc74bb6 100644 --- a/app/models/ci/job_artifact.rb +++ b/app/models/ci/job_artifact.rb @@ -15,6 +15,7 @@ module Ci metadata: nil, trace: nil, junit: 'junit.xml', + codequality: 'codequality.json', sast: 'gl-sast-report.json', dependency_scanning: 'gl-dependency-scanning-report.json', container_scanning: 'gl-container-scanning-report.json', @@ -26,6 +27,7 @@ module Ci metadata: :gzip, trace: :raw, junit: :gzip, + codequality: :gzip, sast: :gzip, dependency_scanning: :gzip, container_scanning: :gzip, @@ -73,7 +75,8 @@ module Ci sast: 5, ## EE-specific dependency_scanning: 6, ## EE-specific container_scanning: 7, ## EE-specific - dast: 8 ## EE-specific + dast: 8, ## EE-specific + codequality: 9 ## EE-specific } enum file_format: { |