diff options
| author | Can Eldem <celdem@gitlab.com> | 2019-08-09 09:17:58 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2019-08-09 09:17:58 +0000 |
| commit | 242b96eb1bf64defc3e263c8d4b182dde36bf3e6 (patch) | |
| tree | f215f6bdd77a1ef21316dddeb1741787dd13d3ee | |
| parent | 1747178bae5cd216acb5d7ca84931e18d234989b (diff) | |
| parent | 5a285b70c36b99ab22345b968471236ff3803ed3 (diff) | |
Merge branch 'fix-code-quality-job' into 'master'
Use vendored template for code quality
See merge request gitlab-org/security-products/license-management!52
| -rw-r--r-- | .gitlab-ci.yml | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b75507..1ac1663 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,8 @@ variables: TMP_IMAGE: $CI_REGISTRY_IMAGE/tmp:$CI_COMMIT_SHA include: - - template: Security/Container-Scanning.gitlab-ci.yml + - template: Container-Scanning.gitlab-ci.yml + - template: Jobs/Code-Quality.gitlab-ci.yml services: - docker:stable-dind @@ -26,21 +27,6 @@ build commit: - docker build -t $TMP_IMAGE . - docker push $TMP_IMAGE -code_quality: - image: docker:stable - stage: test - allow_failure: true - 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 - artifacts: - reports: - codequality: gl-code-quality-report.json - container_scanning: variables: CI_APPLICATION_REPOSITORY: $CI_REGISTRY_IMAGE/tmp # only predefined variables are parameter-expanded (no $TMP_IMAGE) |