diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-04-28 18:05:40 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-04-28 18:05:40 +0000 |
| commit | 15eaca817140c315bf8ded5a5ace265020fe75f5 (patch) | |
| tree | 10a92f29574ecd4082d1cae75e5293749aad60ee | |
| parent | 2952a447794e492122820b5a0eb54f75b83a2abd (diff) | |
| parent | fe57708e6a0f2b09d95e61130310c826b3437524 (diff) | |
| download | gitlab-ce-15eaca817140c315bf8ded5a5ace265020fe75f5.tar.gz | |
Merge branch '31500-fix-rspec_profiling-reporting' into 'master'
Resolve "rspec_profiling is enabled for MySQL"
See merge request !10967
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | config/initializers/rspec_profiling.rb | 8 | ||||
| -rw-r--r--[-rwxr-xr-x] | scripts/prepare_build.sh | 4 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 5 |
4 files changed, 10 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e911d7e5b89..ddc2c5f2542 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,8 +19,8 @@ variables: before_script: - bundle --version - - . scripts/utils.sh - - ./scripts/prepare_build.sh + - source scripts/utils.sh + - source scripts/prepare_build.sh stages: - prepare diff --git a/config/initializers/rspec_profiling.rb b/config/initializers/rspec_profiling.rb index b909cc5b9a4..a7efd74f09e 100644 --- a/config/initializers/rspec_profiling.rb +++ b/config/initializers/rspec_profiling.rb @@ -36,10 +36,10 @@ if Rails.env.test? RspecProfiling::Collectors::PSQL.prepend(RspecProfilingExt::PSQL) config.collector = RspecProfiling::Collectors::PSQL end - end - if ENV.has_key?('CI') && ENV['GITLAB_DATABASE'] == 'postgresql' - RspecProfiling::VCS::Git.prepend(RspecProfilingExt::Git) - RspecProfiling::Run.prepend(RspecProfilingExt::Run) + if ENV.key?('CI') + RspecProfiling::VCS::Git.prepend(RspecProfilingExt::Git) + RspecProfiling::Run.prepend(RspecProfilingExt::Run) + end end end diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index fd173c0ba88..c727a0e2d88 100755..100644 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -1,5 +1,3 @@ -#!/bin/sh - . scripts/utils.sh export SETUP_DB=${SETUP_DB:-true} @@ -32,7 +30,7 @@ sed -i 's/localhost/redis/g' config/resque.yml cp config/gitlab.yml.example config/gitlab.yml if [ "$USE_BUNDLE_INSTALL" != "false" ]; then - retry bundle install --clean $BUNDLE_INSTALL_FLAGS && bundle check + bundle install --clean $BUNDLE_INSTALL_FLAGS && bundle check fi # Only install knapsack after bundle install! Otherwise oddly some native 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' |