summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Bajao <ebajao@gitlab.com>2020-06-03 11:09:41 +0800
committerPatrick Bajao <ebajao@gitlab.com>2020-06-03 11:12:51 +0800
commite431247a262952c6dcec6853f37a055448b257b6 (patch)
tree4aded405d1a9d0434653667412195fd6971973a5
parent7d86c9a7061c6e0b2e9638b2f380d7d51b542f59 (diff)
downloadgitlab-shell-e431247a262952c6dcec6853f37a055448b257b6.tar.gz
Use codequality CI template
In https://gitlab.com/gitlab-org/gitlab/-/issues/218797, it was determined that gitlab-shell is using an outdated image that no longer exists. To ensure that we are using up to date codequality image, we can use the built-in template instead.
-rw-r--r--.gitlab-ci.yml18
1 files changed, 6 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c9c1744..d54fa1c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,11 @@
+include:
+ - template: Code-Quality.gitlab-ci.yml
+
variables:
DOCKER_VERSION: "19.03.0"
workflow:
- rules:
+ rules: &workflow_rules
# For merge requests, create a pipeline.
- if: '$CI_MERGE_REQUEST_IID'
# For `master` branch, create a pipeline (this includes on schedules, pushes, merges, etc.).
@@ -61,18 +64,9 @@ race:
script:
- make test_golang_race
-codequality:
+code_quality:
extends: .use-docker-in-docker
- 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:
- paths: [codeclimate.json]
+ rules: *workflow_rules
sast:
extends: .use-docker-in-docker