summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-02-21 15:02:53 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-02-21 15:02:53 +0000
commit0922027877ea08b42b171f5ab2c4e35eabf4f734 (patch)
tree3281bc65db9e820ca39d56b4af3ce3ef7b0cd4a3 /.gitlab-ci.yml
parent48b1455566a51f4dea6b3b86553d2f239266a1f9 (diff)
parent5ccd3bec955c1869ad621d352c6509365f2077dc (diff)
downloadgitlab-ce-0922027877ea08b42b171f5ab2c4e35eabf4f734.tar.gz
Merge branch 'improve-codequality-job' into 'master'
Merge branch 'improve-codequality-job' into 'master' See merge request gitlab-org/gitlab-ce!17263
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml20
1 files changed, 10 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a46776e1cb1..74dfb9dba6e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -607,22 +607,22 @@ karma:
codequality:
<<: *except-docs
<<: *pull-cache
- before_script: []
- image: docker:latest
stage: test
- variables:
- SETUP_DB: "false"
- DOCKER_DRIVER: overlay
+ image: docker:latest
+ before_script: []
services:
- docker:dind
+ variables:
+ SETUP_DB: "false"
+ DOCKER_DRIVER: overlay2
+ CODECLIMATE_FORMAT: json
+ cache: {}
+ dependencies: []
script:
- - cp .rubocop.yml .rubocop.yml.bak
- - grep -v "rubocop-gitlab-security" .rubocop.yml.bak > .rubocop.yml
- - docker run --env CODECLIMATE_CODE="$PWD" --volume "$PWD":/code --volume /var/run/docker.sock:/var/run/docker.sock --volume /tmp/cc:/tmp/cc dev.gitlab.org:5005/gitlab/gitlab-build-images:gitlab-codeclimate-v2 analyze -f json > raw_codeclimate.json
- - cat raw_codeclimate.json | docker run -i stedolan/jq -c 'map({check_name,fingerprint,location})' > codeclimate.json
- - mv .rubocop.yml.bak .rubocop.yml
+ - ./scripts/codequality analyze -f json > codeclimate.json || true
artifacts:
paths: [codeclimate.json]
+ expire_in: 1 week
sast:
<<: *except-docs