summaryrefslogtreecommitdiff
path: root/.gitlab/ci/rails.gitlab-ci.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-18 18:09:35 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-18 18:09:35 +0000
commit5bfb8d1fad825eec90b0af688c7cd1b352c9056e (patch)
tree385411919c4186d11a769385ad8dafeef6cc36a7 /.gitlab/ci/rails.gitlab-ci.yml
parentaaf59610548d9b0fd01acfd50e831cbe519ecba2 (diff)
downloadgitlab-ce-5bfb8d1fad825eec90b0af688c7cd1b352c9056e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci/rails.gitlab-ci.yml')
-rw-r--r--.gitlab/ci/rails.gitlab-ci.yml19
1 files changed, 18 insertions, 1 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index f9074adeaba..82ce9310ee8 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -204,8 +204,25 @@ gitlab:setup:
rspec:coverage:
extends:
- .rails-job-base
- - .rails:rules:ee-and-foss
+ - .rails:rules:ee-only
stage: post-test
+ # We cannot use needs since it would mean needing 84 jobs (since most are parallelized)
+ # so we use `dependencies` here.
+ dependencies:
+ - setup-test-env
+ - rspec migration pg9
+ - rspec unit pg9
+ - rspec integration pg9
+ - rspec system pg9
+ - rspec-ee migration pg9
+ - rspec-ee unit pg9
+ - rspec-ee integration pg9
+ - rspec-ee system pg9
+ - rspec-ee unit pg9 geo
+ - rspec-ee integration pg9 geo
+ - rspec-ee system pg9 geo
+ - memory-static
+ - memory-on-boot
variables:
SETUP_DB: "false"
cache: