Merge branch 'ee-31500-fix-rspec_profiling-reporting' into 'master'

[EE] Resolve "rspec_profiling is enabled for MySQL"

See merge request !1756

.gitlab-ci.yml

@@ -22,8 +22,8 @@ variables:
 
 before_script:
   - bundle --version
-  - . scripts/utils.sh
-  - ./scripts/prepare_build.sh
+  - source scripts/utils.sh
+  - source scripts/prepare_build.sh
 
 stages:
 - prepare

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'
+    if ENV.key?('CI')
       RspecProfiling::VCS::Git.prepend(RspecProfilingExt::Git)
       RspecProfiling::Run.prepend(RspecProfilingExt::Run)
     end
+  end
 end

scripts/prepare_build.sh

-#!/bin/sh
-
 . scripts/utils.sh
 
 export SETUP_DB=${SETUP_DB:-true}
@@ -44,7 +42,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 install --clean $BUNDLE_INSTALL_FLAGS && bundle check
 fi
 
 # Only install knapsack after bundle install! Otherwise oddly some native

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'