summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-05-24 15:58:28 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-05-24 15:58:28 +0000
commit6d2a6139721df93c633c58c24ed9a88ac59a080b (patch)
tree4eab23ec236f4a9eb40400f6092390d339d025c0 /vendor
parent04efc4ea0c231c66dbf063e781b663936ed9d28f (diff)
parent8c8a794fc89211e6d8a5df24cc00e521889e202c (diff)
downloadgitlab-ce-6d2a6139721df93c633c58c24ed9a88ac59a080b.tar.gz
Merge branch '5779_rename_code_quality_job_and_artifact' into 'master'
Rename code quality job and artifact. See merge request gitlab-org/gitlab-ce!19049
Diffstat (limited to 'vendor')
-rw-r--r--vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
index 45cb43ae8ef..589ebcf1414 100644
--- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
+++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
@@ -77,7 +77,7 @@ test:
only:
- branches
-codequality:
+code_quality:
image: docker:stable
variables:
DOCKER_DRIVER: overlay2
@@ -86,9 +86,9 @@ codequality:
- docker:stable-dind
script:
- setup_docker
- - codeclimate
+ - code_quality
artifacts:
- paths: [codeclimate.json]
+ paths: [gl-code-quality-report.json]
performance:
stage: performance
@@ -409,7 +409,7 @@ rollout 100%:
./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-container-scanning-report.json -l clair.log -w clair-whitelist.yml ${CI_APPLICATION_REPOSITORY}:${CI_APPLICATION_TAG} || true
}
- function codeclimate() {
+ function code_quality() {
docker run --env SOURCE_CODE="$PWD" \
--volume "$PWD":/code \
--volume /var/run/docker.sock:/var/run/docker.sock \