summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-02-21 09:48:56 +0000
committerRémy Coutable <remy@rymai.me>2018-02-21 15:21:05 +0100
commit5ccd3bec955c1869ad621d352c6509365f2077dc (patch)
tree50083027987f71ac88d2d4b9151fa00794256e12 /.gitlab-ci.yml
parent6d2a5f044f82f9500e8694a848125f976cb6d189 (diff)
downloadgitlab-ce-5ccd3bec955c1869ad621d352c6509365f2077dc.tar.gz
Merge branch 'improve-codequality-job' into 'master'improve-codequality-job
Simplify the codequality job See merge request gitlab-org/gitlab-ee!4602
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 9c3556f5cce..f1e28d0928a 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