diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
| commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
| tree | 544930fb309b30317ae9797a9683768705d664c4 /qa/qa/specs/runner.rb | |
| parent | 4b1de649d0168371549608993deac953eb692019 (diff) | |
| download | gitlab-ce-8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'qa/qa/specs/runner.rb')
| -rw-r--r-- | qa/qa/specs/runner.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qa/qa/specs/runner.rb b/qa/qa/specs/runner.rb index afeddeaa5d5..9027f17678d 100644 --- a/qa/qa/specs/runner.rb +++ b/qa/qa/specs/runner.rb @@ -40,6 +40,8 @@ module QA tags_for_rspec.push(%w[--tag ~orchestrated]) unless (%w[-t --tag] & options).any? end + tags_for_rspec.push(%w[--tag ~geo]) unless QA::Runtime::Env.geo_environment? + tags_for_rspec.push(%w[--tag ~skip_signup_disabled]) if QA::Runtime::Env.signup_disabled? tags_for_rspec.push(%w[--tag ~skip_live_env]) if QA::Runtime::Env.dot_com? |