Commit 3826c527 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'ee-tests-on-ee-only' into 'master'

Only run EE tests on the EE repository

See merge request gitlab-org/gitlab-ee!16191
parents ce85aeb7 fcf7ca8d
...@@ -8,6 +8,11 @@ ...@@ -8,6 +8,11 @@
- master@gitlab/gitlabhq - master@gitlab/gitlabhq
- master@gitlab/gitlab-ee - master@gitlab/gitlab-ee
.only-gitlab-ee:
only:
- branches@gitlab-org/gitlab-ee
- tags@gitlab-org/gitlab-ee
.rake-exec: .rake-exec:
extends: extends:
- .default-tags - .default-tags
...@@ -317,7 +322,9 @@ coverage: ...@@ -317,7 +322,9 @@ coverage:
## EE-specific content ## EE-specific content
.rspec-base-ee: .rspec-base-ee:
extends: .rspec-base extends:
- .rspec-base
- .only-gitlab-ee
script: script:
- JOB_NAME=( $CI_JOB_NAME ) - JOB_NAME=( $CI_JOB_NAME )
- TEST_TOOL=${JOB_NAME[0]} - TEST_TOOL=${JOB_NAME[0]}
...@@ -356,7 +363,9 @@ rspec system pg ee: ...@@ -356,7 +363,9 @@ rspec system pg ee:
parallel: 5 parallel: 5
.rspec-base-pg-geo: .rspec-base-pg-geo:
extends: .rspec-base extends:
- .rspec-base
- .only-gitlab-ee
script: script:
- JOB_NAME=( $CI_JOB_NAME ) - JOB_NAME=( $CI_JOB_NAME )
- TEST_TOOL=${JOB_NAME[0]} - TEST_TOOL=${JOB_NAME[0]}
...@@ -434,7 +443,9 @@ migration:upgrade-pg-ce-to-ee: ...@@ -434,7 +443,9 @@ migration:upgrade-pg-ce-to-ee:
- bundle exec rake db:migrate - bundle exec rake db:migrate
db:rollback geo: db:rollback geo:
extends: db:rollback extends:
- db:rollback
- .only-gitlab-ee
script: script:
- bundle exec rake geo:db:migrate VERSION=20170627195211 - bundle exec rake geo:db:migrate VERSION=20170627195211
- bundle exec rake geo:db:migrate - bundle exec rake geo:db:migrate
......
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