summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMayra Cabrera <mcabrera@gitlab.com>2019-07-11 20:31:19 +0000
committerMayra Cabrera <mcabrera@gitlab.com>2019-07-11 20:31:19 +0000
commit410a506c09c968cd50227df239507d74aa1c706a (patch)
treef43eb47119c47731a397dabc8fb31ade7ddf70da
parent33445cfc29d8ca4f0452844ca0ce4299dd6996ba (diff)
parent9d7c70c9deebcb056a829273c8ce27e82af19a76 (diff)
downloadgitlab-ce-410a506c09c968cd50227df239507d74aa1c706a.tar.gz
Merge branch 'ci-clean-up-reports-jobs' into 'master'
Clean up CI reports See merge request gitlab-org/gitlab-ce!30272
-rw-r--r--.gitlab/ci/reports.gitlab-ci.yml12
-rw-r--r--lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml1
2 files changed, 7 insertions, 6 deletions
diff --git a/.gitlab/ci/reports.gitlab-ci.yml b/.gitlab/ci/reports.gitlab-ci.yml
index 89b5ae38072..ca55bbd32a7 100644
--- a/.gitlab/ci/reports.gitlab-ci.yml
+++ b/.gitlab/ci/reports.gitlab-ci.yml
@@ -10,17 +10,17 @@ code_quality:
tags: []
before_script: []
cache: {}
- dependencies: []
sast:
extends: .dedicated-no-docs
- before_script: []
tags: []
+ before_script: []
+ cache: {}
variables:
- SAST_CONFIDENCE_LEVEL: 2
- DOCKER_DRIVER: overlay2
+ SAST_BRAKEMAN_LEVEL: 2
dependency_scanning:
- before_script: []
- tags: []
extends: .dedicated-no-docs
+ tags: []
+ before_script: []
+ cache: {}
diff --git a/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml
index 8a84744aa2d..005ea4b7a46 100644
--- a/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml
@@ -22,6 +22,7 @@ code_quality:
reports:
codequality: gl-code-quality-report.json
expire_in: 1 week
+ dependencies: []
only:
- branches
- tags