diff options
| author | Mark Lapierre <mlapierre@gitlab.com> | 2019-02-20 16:46:22 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-02-20 19:14:08 +0300 |
| commit | f1e2b02e2db5bae6631d9aa422806cdf399b43b4 (patch) | |
| tree | 18cd28e2c6b52f637ac53478899e7ff10ad4d4b8 | |
| parent | 043f7a8360343ab8e6fc21a41d02040b28c923e3 (diff) | |
Merge branch 'tn-quality-add_id_to_group_name' into 'master'
Added id to namespace name generator
See merge request gitlab-org/gitlab-ce!25285
(cherry picked from commit 9c7363db1fbf17c5e8ab68930932911352f94cb2)
0718bfe2 Added id to namespace
a5def527 Apply suggestion to qa/qa/runtime/namespace.rb
94af2d69 Adding comment to check script
5b8e5a5b Apply suggestion to qa/qa/runtime/namespace.rb
| -rw-r--r-- | qa/qa/runtime/namespace.rb | 4 | ||||
| -rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/qa/qa/runtime/namespace.rb b/qa/qa/runtime/namespace.rb index 704c65467e0..9d7c1aea508 100644 --- a/qa/qa/runtime/namespace.rb +++ b/qa/qa/runtime/namespace.rb @@ -8,7 +8,9 @@ module QA end def name - Runtime::Env.namespace_name || "qa-test-#{time.strftime('%Y-%m-%d-%H-%M-%S')}" + # If any changes are made to the name tag, following script has to be considered: + # https://ops.gitlab.net/gitlab-com/gl-infra/traffic-generator/blob/master/bin/janitor.bash + @name ||= Runtime::Env.namespace_name || "qa-test-#{time.strftime('%Y-%m-%d-%H-%M-%S')}-#{SecureRandom.hex(8)}" end def path diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb index 545da0a8b85..bf20ff99a99 100644 --- a/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb @@ -2,7 +2,7 @@ module QA # Failure issue: https://gitlab.com/gitlab-org/quality/staging/issues/31 - context 'Create', :quarantine do + context 'Create' do describe 'Merge request squashing' do it 'user squashes commits while merging' do Runtime::Browser.visit(:gitlab, Page::Main::Login) |