Resolve "rspec_profiling is enabled for MySQL"
This commit is contained in:
parent
2952a44779
commit
fe57708e6a
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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'
|
||||
|
|
Loading…
Reference in New Issue