summaryrefslogtreecommitdiff
path: root/.gitlab/ci/rails/shared.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab/ci/rails/shared.gitlab-ci.yml')
-rw-r--r--.gitlab/ci/rails/shared.gitlab-ci.yml18
1 files changed, 15 insertions, 3 deletions
diff --git a/.gitlab/ci/rails/shared.gitlab-ci.yml b/.gitlab/ci/rails/shared.gitlab-ci.yml
index 60c9826abfe..d47bac5e433 100644
--- a/.gitlab/ci/rails/shared.gitlab-ci.yml
+++ b/.gitlab/ci/rails/shared.gitlab-ci.yml
@@ -109,12 +109,18 @@ include:
.rspec-ee-base-pg11:
extends:
- .rspec-base
- - .use-pg11-ee
+ - .use-pg11-es7-ee
.rspec-ee-base-pg12:
extends:
- .rspec-base
- - .use-pg12-ee
+ - .use-pg12-es7-ee
+
+.rspec-ee-base-pg12-es7:
+ extends:
+ - .rspec-base
+ - .use-pg12-es7-ee
+ - .rails:rules:run-search-tests
.rspec-ee-base-pg12-es8:
extends:
@@ -128,10 +134,16 @@ include:
- .use-pg12-opensearch1-ee
- .rails:rules:run-search-tests
+.rspec-ee-base-pg12-opensearch2:
+ extends:
+ - .rspec-base
+ - .use-pg12-opensearch2-ee
+ - .rails:rules:run-search-tests
+
.rspec-ee-base-pg13:
extends:
- .rspec-base
- - .use-pg13-ee
+ - .use-pg13-es7-ee
.db-job-base:
extends: