diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-04-28 18:05:39 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-04-28 18:05:39 +0000 |
| commit | fe57708e6a0f2b09d95e61130310c826b3437524 (patch) | |
| tree | 10a92f29574ecd4082d1cae75e5293749aad60ee /spec/spec_helper.rb | |
| parent | 2952a447794e492122820b5a0eb54f75b83a2abd (diff) | |
| download | gitlab-ce-fe57708e6a0f2b09d95e61130310c826b3437524.tar.gz | |
Resolve "rspec_profiling is enabled for MySQL"
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e67ad8f3455..e2d5928e5b2 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -13,8 +13,9 @@ rspec_profiling_is_configured = ENV['RSPEC_PROFILING_POSTGRES_URL'] || ENV['RSPEC_PROFILING'] branch_can_be_profiled = - ENV['CI_COMMIT_REF_NAME'] == 'master' || - ENV['CI_COMMIT_REF_NAME'] =~ /rspec-profile/ + ENV['GITLAB_DATABASE'] == 'postgresql' && + (ENV['CI_COMMIT_REF_NAME'] == 'master' || + ENV['CI_COMMIT_REF_NAME'] =~ /rspec-profile/) if rspec_profiling_is_configured && (!ENV.key?('CI') || branch_can_be_profiled) require 'rspec_profiling/rspec' |