diff options
author | Matija Čupić <matteeyah@gmail.com> | 2019-03-15 15:38:18 +0100 |
---|---|---|
committer | Matija Čupić <matteeyah@gmail.com> | 2019-03-15 16:37:27 +0100 |
commit | dfacd3a02da14075c85d7d5a89c453dfef37a800 (patch) | |
tree | 700e886f903fcad1da12f1240f0d326e265e9272 | |
parent | 3b3b16024178af72e3e84bda61a54e7f3c480e29 (diff) | |
download | gitlab-ce-dfacd3a02da14075c85d7d5a89c453dfef37a800.tar.gz |
Move gitlab-org specific config to .gitlab-ci.yml
-rw-r--r-- | .gitlab-ci.yml | 8 | ||||
-rw-r--r-- | lib/gitlab/ci/templates/Code-Quality.gitlab-ci.yml | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc35c598332..6c3862c7645 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -777,6 +777,14 @@ jest: code_quality: <<: *dedicated-no-docs-no-db-pull-cache-job + # gitlab-org runners set `privileged: false` but we need to have it set to true + # since we're using Docker in Docker + tags: [] + before_script: [] + cache: {} + dependencies: [] + variables: + SETUP_DB: "false" sast: <<: *dedicated-no-docs-no-db-pull-cache-job diff --git a/lib/gitlab/ci/templates/Code-Quality.gitlab-ci.yml b/lib/gitlab/ci/templates/Code-Quality.gitlab-ci.yml index ebb01ae19ca..10b25af904f 100644 --- a/lib/gitlab/ci/templates/Code-Quality.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Code-Quality.gitlab-ci.yml @@ -1,17 +1,10 @@ code_quality: image: docker:stable allow_failure: true - # gitlab-org runners set `privileged: false` but we need to have it set to true - # since we're using Docker in Docker - tags: [] - before_script: [] services: - docker:stable-dind variables: - SETUP_DB: "false" DOCKER_DRIVER: overlay2 - cache: {} - dependencies: [] script: - docker run --env SOURCE_CODE="$PWD" |