Commit c32eb1be authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch 'mo-use-new-code-quality-image' into 'master'

Use new codequality docker image

See merge request gitlab-org/gitlab!27098
parents 2ddfad08 b07b9f66
...@@ -20,7 +20,7 @@ code_quality: ...@@ -20,7 +20,7 @@ code_quality:
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: "" DOCKER_TLS_CERTDIR: ""
CODE_QUALITY_IMAGE: "registry.gitlab.com/gitlab-org/security-products/codequality:0.85.9" CODE_QUALITY_IMAGE: "registry.gitlab.com/gitlab-org/ci-cd/codequality:0.85.9"
script: script:
- | - |
if ! docker info &>/dev/null; then if ! docker info &>/dev/null; then
......
---
title: Use new codequality docker image from ci-cd group
merge_request: 27098
author:
type: other
...@@ -420,7 +420,7 @@ tests, it's up to you to add them. ...@@ -420,7 +420,7 @@ tests, it's up to you to add them.
### Auto Code Quality **(STARTER)** ### Auto Code Quality **(STARTER)**
Auto Code Quality uses the Auto Code Quality uses the
[Code Quality image](https://gitlab.com/gitlab-org/security-products/codequality) to run [Code Quality image](https://gitlab.com/gitlab-org/ci-cd/codequality) to run
static analysis and other code checks on the current code. The report is static analysis and other code checks on the current code. The report is
created, and is uploaded as an artifact which you can later download and check created, and is uploaded as an artifact which you can later download and check
out. out.
......
...@@ -16,7 +16,7 @@ Code Quality: ...@@ -16,7 +16,7 @@ Code Quality:
subscription. subscription.
- Runs in [pipelines](../../../ci/pipelines/index.md) using a Docker image built in the - Runs in [pipelines](../../../ci/pipelines/index.md) using a Docker image built in the
[GitLab Code [GitLab Code
Quality](https://gitlab.com/gitlab-org/security-products/codequality) project using [default Code Climate configurations](https://gitlab.com/gitlab-org/security-products/codequality/-/tree/master/codeclimate_defaults). Quality](https://gitlab.com/gitlab-org/ci-cd/codequality) project using [default Code Climate configurations](https://gitlab.com/gitlab-org/ci-cd/codequality/-/tree/master/codeclimate_defaults).
- Can make use of a [template](#example-configuration). - Can make use of a [template](#example-configuration).
- Is available with [Auto - Is available with [Auto
DevOps](../../../topics/autodevops/index.md#auto-code-quality-starter). DevOps](../../../topics/autodevops/index.md#auto-code-quality-starter).
...@@ -135,14 +135,14 @@ code_quality: ...@@ -135,14 +135,14 @@ code_quality:
--env SOURCE_CODE="$PWD" --env SOURCE_CODE="$PWD"
--volume "$PWD":/code --volume "$PWD":/code
--volume /var/run/docker.sock:/var/run/docker.sock --volume /var/run/docker.sock:/var/run/docker.sock
"registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code "registry.gitlab.com/gitlab-org/ci-cd/codequality:$SP_VERSION" /code
artifacts: artifacts:
reports: reports:
codequality: gl-code-quality-report.json codequality: gl-code-quality-report.json
``` ```
In GitLab 12.6, Code Quality switched to the In GitLab 12.6, Code Quality switched to the
[new versioning scheme](https://gitlab.com/gitlab-org/security-products/codequality/-/merge_requests/38). [new versioning scheme](https://gitlab.com/gitlab-org/ci-cd/codequality#versioning-and-release-cycle).
It is highly recommended to include the Code Quality template as shown in the It is highly recommended to include the Code Quality template as shown in the
[example configuration](#example-configuration), which uses the new versioning scheme. [example configuration](#example-configuration), which uses the new versioning scheme.
If not using the template, the `SP_VERSION` variable can be hardcoded to use the If not using the template, the `SP_VERSION` variable can be hardcoded to use the
...@@ -162,7 +162,7 @@ code_quality: ...@@ -162,7 +162,7 @@ code_quality:
--env SOURCE_CODE="$PWD" --env SOURCE_CODE="$PWD"
--volume "$PWD":/code --volume "$PWD":/code
--volume /var/run/docker.sock:/var/run/docker.sock --volume /var/run/docker.sock:/var/run/docker.sock
"registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code "registry.gitlab.com/gitlab-org/ci-cd/codequality:$SP_VERSION" /code
artifacts: artifacts:
reports: reports:
codequality: gl-code-quality-report.json codequality: gl-code-quality-report.json
...@@ -184,7 +184,7 @@ code_quality: ...@@ -184,7 +184,7 @@ code_quality:
--env SOURCE_CODE="$PWD" --env SOURCE_CODE="$PWD"
--volume "$PWD":/code --volume "$PWD":/code
--volume /var/run/docker.sock:/var/run/docker.sock --volume /var/run/docker.sock:/var/run/docker.sock
"registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code "registry.gitlab.com/gitlab-org/ci-cd/codequality:$SP_VERSION" /code
artifacts: artifacts:
paths: [gl-code-quality-report.json] paths: [gl-code-quality-report.json]
``` ```
...@@ -216,7 +216,7 @@ The Code Quality job supports environment variables that users can set to ...@@ -216,7 +216,7 @@ The Code Quality job supports environment variables that users can set to
configure job execution at runtime. configure job execution at runtime.
For a list of available environment variables, see For a list of available environment variables, see
[Environment variables](https://gitlab.com/gitlab-org/security-products/codequality/blob/master/README.md#environment-variables). [Environment variables](https://gitlab.com/gitlab-org/ci-cd/codequality#environment-variables).
## Implementing a custom tool ## Implementing a custom tool
......
...@@ -7,7 +7,7 @@ code_quality: ...@@ -7,7 +7,7 @@ code_quality:
variables: variables:
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: "" DOCKER_TLS_CERTDIR: ""
CODE_QUALITY_IMAGE: "registry.gitlab.com/gitlab-org/security-products/codequality:0.85.9" CODE_QUALITY_IMAGE: "registry.gitlab.com/gitlab-org/ci-cd/codequality:0.85.9"
script: script:
- | - |
if ! docker info &>/dev/null; then if ! docker info &>/dev/null; then
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment