Run EE-specific specs in a dedicated job

Signed-off-by: Rémy Coutable <remy@rymai.me>

.gitlab-ci.yml

@@ -134,6 +134,27 @@ stages:
   <<: *rspec-metadata
   <<: *use-pg
 
+.rspec-metadata-mysql: &rspec-metadata-mysql
+  <<: *rspec-metadata
+  <<: *use-mysql
+
+.rspec-metadata-ee: &rspec-metadata-ee
+  <<: *rspec-metadata
+  stage: test
+  script:
+    - export NO_KNAPSACK=1
+    - export CACHE_CLASSES=true
+    - scripts/gitaly-test-spawn
+    - bundle exec rspec --color --format documentation ee/spec/
+
+.rspec-ee-pg: &rspec-ee-pg
+  <<: *rspec-metadata-ee
+  <<: *use-pg
+
+.rspec-ee-mysql: &rspec-ee-mysql
+  <<: *rspec-metadata-ee
+  <<: *use-mysql
+
 .rspec-geo-pg-9-6: &rspec-metadata-pg-geo
   <<: *rspec-metadata
   <<: *use-pg-9-6-no-elasticsearch
@@ -143,11 +164,7 @@ stages:
     - export CACHE_CLASSES=true
     - source scripts/prepare_postgres_fdw.sh
     - scripts/gitaly-test-spawn
-    - bundle exec rspec --color --format documentation --tag geo spec/
-
-.rspec-metadata-mysql: &rspec-metadata-mysql
-  <<: *rspec-metadata
-  <<: *use-mysql
+    - bundle exec rspec --color --format documentation --tag geo ee/spec/
 
 .spinach-metadata: &spinach-metadata
   <<: *dedicated-runner
@@ -346,7 +363,11 @@ setup-test-env:
       - tmp/tests
       - config/secrets.yml
 
+# EE jobs
+rspec-pg ee: *rspec-ee-pg
+rspec-mysql ee: *rspec-ee-mysql
 rspec-pg geo: *rspec-metadata-pg-geo
+## EE jobs
 
 rspec-pg 0 27: *rspec-metadata-pg
 rspec-pg 1 27: *rspec-metadata-pg

spec/spec_helper.rb

@@ -31,7 +31,7 @@ end
 require 'rainbow/ext/string'
 
 # EE specific support
-Dir[Rails.root.join("spec/ee/support/**/*.rb")].each { |f| require f }
+Dir[Rails.root.join("ee/spec/support/**/*.rb")].each { |f| require f }
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.