diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-06-18 15:33:44 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-06-18 15:33:44 +0000 |
| commit | 073a65fe49f00acb5bff061975181c4e389555c2 (patch) | |
| tree | e4bff913c1bb0cddabcd9271acefc68c302d323b | |
| parent | 0eae158c15eb047a58a3f51db0c32f1b841b4b60 (diff) | |
| parent | f0773d9ec8628e301c5a673ff7b7c2193569395d (diff) | |
| download | gitlab-ce-63415-error-when-viewing-page-2-or-later-of-elasticsearch-search-results.tar.gz | |
Merge branch 'mc/bug/old-codequality-template-autodevops' into 'master'63415-error-when-viewing-page-2-or-later-of-elasticsearch-search-results
Use new Code Quality job definition in Auto DevOps
See merge request gitlab-org/gitlab-ce!29475
| -rw-r--r-- | lib/gitlab/ci/templates/Code-Quality.gitlab-ci.yml | 19 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml | 17 |
2 files changed, 12 insertions, 24 deletions
diff --git a/lib/gitlab/ci/templates/Code-Quality.gitlab-ci.yml b/lib/gitlab/ci/templates/Code-Quality.gitlab-ci.yml index 10b25af904f..b4ccf96b859 100644 --- a/lib/gitlab/ci/templates/Code-Quality.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Code-Quality.gitlab-ci.yml @@ -1,17 +1,2 @@ -code_quality: - image: docker:stable - allow_failure: true - services: - - docker:stable-dind - variables: - DOCKER_DRIVER: overlay2 - script: - - 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:11-8-stable" /code - artifacts: - reports: - codequality: gl-code-quality-report.json - expire_in: 1 week +include: + template: Jobs/Code-Quality.gitlab-ci.yml diff --git a/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml index b09a24d8e22..46c4c755729 100644 --- a/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml @@ -4,21 +4,24 @@ code_quality: allow_failure: true services: - docker:stable-dind + variables: + DOCKER_DRIVER: overlay2 script: - - export CQ_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') - | if ! docker info &>/dev/null; then if [ -z "$DOCKER_HOST" -a "$KUBERNETES_PORT" ]; then export DOCKER_HOST='tcp://localhost:2375' fi fi - - | - 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:$CQ_VERSION" /code + - 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:11-8-stable" /code artifacts: - paths: [gl-code-quality-report.json] + reports: + codequality: gl-code-quality-report.json + expire_in: 1 week only: - branches - tags |