diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-11-05 20:59:55 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-11-05 20:59:55 +0000 |
| commit | ec37e707326ac1f19a49477f21f01f9df8621e49 (patch) | |
| tree | ddf322de41472d1fedee727c9ddddd6b45cd9061 | |
| parent | d33dad88a143e7f0dc495cb5bff45a558d5d81d9 (diff) | |
| parent | e65162842c47f43df5831f0b5416045171ea62c6 (diff) | |
| download | gitlab-ce-testing-review-app-password.tar.gz | |
Merge branch 'fix-codequality' into 'master'testing-review-app-password
Fix invalid artifact path for codequality
See merge request gitlab-org/gitlab-ce!22816
| -rw-r--r-- | app/models/ci/job_artifact.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/ci/config/entry/reports_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/ci/job_artifact.rb b/app/models/ci/job_artifact.rb index 34a889057ab..11c88200c37 100644 --- a/app/models/ci/job_artifact.rb +++ b/app/models/ci/job_artifact.rb @@ -15,7 +15,7 @@ module Ci metadata: nil, trace: nil, junit: 'junit.xml', - codequality: 'codequality.json', + codequality: 'gl-code-quality-report.json', sast: 'gl-sast-report.json', dependency_scanning: 'gl-dependency-scanning-report.json', container_scanning: 'gl-container-scanning-report.json', diff --git a/spec/lib/gitlab/ci/config/entry/reports_spec.rb b/spec/lib/gitlab/ci/config/entry/reports_spec.rb index 8095a231cf3..1140bfdf6c3 100644 --- a/spec/lib/gitlab/ci/config/entry/reports_spec.rb +++ b/spec/lib/gitlab/ci/config/entry/reports_spec.rb @@ -33,7 +33,7 @@ describe Gitlab::Ci::Config::Entry::Reports do where(:keyword, :file) do :junit | 'junit.xml' - :codequality | 'codequality.json' + :codequality | 'gl-code-quality-report.json' :sast | 'gl-sast-report.json' :dependency_scanning | 'gl-dependency-scanning-report.json' :container_scanning | 'gl-container-scanning-report.json' |