Commit e248ec66 authored by Sean McGivern's avatar Sean McGivern

Merge branch '29787-monitor-ee-rspec-tests-separately' into 'master'

Resolve "Consider tracking the EE test suite with `rspec_profiling`"

Closes #29787

See merge request !10226
parents 40e3a701 e0e208ab
......@@ -7,7 +7,11 @@ module RspecProfilingExt
module Git
def branch
ENV['CI_COMMIT_REF_NAME'] || super
if ENV['CI_COMMIT_REF_NAME']
"#{defined?(Gitlab::License) ? 'ee' : 'ce'}:#{ENV['CI_COMMIT_REF_NAME']}"
else
super
end
end
end
......
......@@ -9,7 +9,8 @@ require 'rspec/rails'
require 'shoulda/matchers'
require 'rspec/retry'
if ENV['RSPEC_PROFILING_POSTGRES_URL'] || ENV['RSPEC_PROFILING']
if (ENV['RSPEC_PROFILING_POSTGRES_URL'] || ENV['RSPEC_PROFILING']) &&
(!ENV.has_key?('CI') || ENV['CI_COMMIT_REF_NAME'] == 'master')
require 'rspec_profiling/rspec'
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment