Commit 5497d584 authored by Michael Kozono's avatar Michael Kozono

Merge branch...

Merge branch '11208-geo-use-geo-or-geo-to-run-geo-tagged-specs-before-other-specs-geo' into 'master'

Resolve "Geo: Use `*-geo` or `geo-*` to run Geo tagged specs before other specs"

Closes #11208

See merge request gitlab-org/gitlab-ee!11813
parents 9861eaef 8f11283c
......@@ -33,6 +33,7 @@ stages:
- build
- prepare
- merge
- quick-test
- test
- review
- qa
......
......@@ -387,8 +387,27 @@ rspec-mysql-ee:
<<: *only-schedules-master
parallel: 10
rspec-pg geo: *rspec-metadata-pg-geo-9-6
rspec-pg-10 geo: *rspec-metadata-pg-geo-10-2
rspec-pg geo:
<<: *rspec-metadata-pg-geo-9-6
except:
- /(^geo[\/-].*|.*-geo$)/
rspec-pg-10 geo:
<<: *rspec-metadata-pg-geo-10-2
except:
- /(^geo[\/-].*|.*-geo$)/
quick-rspec-pg geo:
<<: *rspec-metadata-pg-geo-9-6
stage: quick-test
only:
- /(^geo[\/-].*|.*-geo$)/
quick-rspec-pg-10 geo:
<<: *rspec-metadata-pg-geo-10-2
stage: quick-test
only:
- /(^geo[\/-].*|.*-geo$)/
.rspec-quarantine-ee: &rspec-quarantine-ee
<<: *only-schedules-master
......
......@@ -9,6 +9,7 @@ module EESpecificCheck
'scripts/**/*',
'vendor/assets/javascripts/jasmine-jquery.js',
'.gitlab-ci.yml',
'.gitlab/ci/rails.gitlab-ci.yml',
'db/schema.rb',
'locale/gitlab.pot',
##
......
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