diff options
| author | bst-marge-bot <marge-bot@buildstream.build> | 2019-08-05 17:51:05 +0000 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-08-05 17:51:05 +0000 |
| commit | 7adc250f68f6f9e0cc20f41bf8bab7931f48311f (patch) | |
| tree | 4e355bdfa67ebb6d870161c65c95414e7bbeba28 | |
| parent | 4f3c70b8e90ddd0bd87c301363fa3e0408d395e3 (diff) | |
| parent | 66664ddf14a40a0b29b7fb4f7f90ac10ef62f052 (diff) | |
| download | buildstream-7adc250f68f6f9e0cc20f41bf8bab7931f48311f.tar.gz | |
Merge branch 'jjardon/code_quality' into 'master'
.gitlab-ci.yml: Use new way to define code_quality job
Closes #1099
See merge request BuildStream/buildstream!1522
| -rw-r--r-- | .gitlab-ci.yml | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 94ab3dc74..bf0b8f557 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,6 @@ +include: + - template: Code-Quality.gitlab-ci.yml + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-debian:9-master-46405991 cache: @@ -293,30 +296,6 @@ overnight-tests-no-cache: tags: - overnight-tests -# Check code quality with gitlab's built-in feature. -# -code_quality: - image: docker:stable - stage: test - variables: - DOCKER_DRIVER: overlay2 - # Required to be able to connect to the docker daemon. See https://gitlab.com/gitlab-org/gitlab-runner/issues/4501 - DOCKER_TLS_CERTDIR: "" - allow_failure: true - services: - - docker:stable-dind - script: - - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') - - docker run - --env SOURCE_CODE="$PWD" - --volume "$PWD":/code - --volume /var/run/docker.sock:/var/run/docker.sock - "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code - except: - - schedules - artifacts: - paths: [gl-code-quality-report.json] - ##################################################### # Post stage # ##################################################### |