Commit 8f11283c authored by Valery Sizov's avatar Valery Sizov

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

It's also assumes that there will be more teams using new quick stage
parent 0d0473ff
......@@ -17,7 +17,7 @@ variables:
ES_JAVA_OPTS: "-Xms256m -Xmx256m"
ELASTIC_URL: "http://elastic:changeme@docker.elastic.co-elasticsearch-elasticsearch:9200"
EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master-ee.json
before_script:
- bundle --version
- date
......@@ -33,6 +33,7 @@ stages:
- build
- prepare
- merge
- quick-test
- test
- post-test
- pages
......
......@@ -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
......
......@@ -10,6 +10,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'
].freeze
......
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