Commit 1e5901bc authored by Ash McKenzie's avatar Ash McKenzie

Merge branch 'fix-rspec-fail-fast-elasticsearch' into 'master'

Add elasticsearch to rspec fail-fast

See merge request gitlab-org/gitlab!42425
parents 8507d5cf 25fdd4fc
...@@ -507,7 +507,7 @@ rspec-ee system pg12 geo: ...@@ -507,7 +507,7 @@ rspec-ee system pg12 geo:
# EE: Canonical MR pipelines # EE: Canonical MR pipelines
rspec fail-fast: rspec fail-fast:
extends: extends:
- .rspec-base-pg11 - .rspec-ee-base-pg11 # This job also runs EE spec which needs elasticsearch
- .rails:rules:rspec fail-fast - .rails:rules:rspec fail-fast
stage: test stage: test
needs: ["setup-test-env", "retrieve-tests-metadata", "compile-test-assets", "detect-tests"] needs: ["setup-test-env", "retrieve-tests-metadata", "compile-test-assets", "detect-tests"]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment