diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-01-14 19:22:54 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-01-15 14:43:03 +0100 |
| commit | d71eb8fc1ad4e722868cd4b9ea54044f17bc46e2 (patch) | |
| tree | 29d95bdc822dc4d1a2811556bfe4fc127f1b9aaa | |
| parent | b876d5c861ced9b36691133e8438f996c2cddae2 (diff) | |
| download | gitlab-ce-d71eb8fc1ad4e722868cd4b9ea54044f17bc46e2.tar.gz | |
Add jobs to run quarantine tests
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | .gitlab-ci.yml | 16 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6cbc8e21c76..d736e0fa5c3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -499,6 +499,22 @@ rspec-mysql: <<: *rspec-metadata-mysql parallel: 50 +.rspec-quarantine: &rspec-quarantine + script: + - export CACHE_CLASSES=true + - scripts/gitaly-test-spawn + - bin/rspec --color --format documentation --tag quarantine spec/ + +rspec-pg-quarantine: + <<: *rspec-metadata-pg + <<: *rspec-quarantine + allow_failure: true + +rspec-mysql-quarantine: + <<: *rspec-metadata-mysql + <<: *rspec-quarantine + allow_failure: true + static-analysis: <<: *dedicated-no-docs-no-db-pull-cache-job dependencies: diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index dfdb23492bf..72684caad32 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -22,7 +22,7 @@ if rspec_profiling_is_configured && (!ENV.key?('CI') || branch_can_be_profiled) require 'rspec_profiling/rspec' end -if ENV['CI'] && !ENV['NO_KNAPSACK'] +if ENV['CI'] && ENV['KNAPSACK_GENERATE_REPORT'] && !ENV['NO_KNAPSACK'] require 'knapsack' Knapsack::Adapters::RSpecAdapter.bind end |