diff options
author | Tomislav Nikic <tnikic@gitlab.com> | 2019-02-20 16:46:22 +0300 |
---|---|---|
committer | Mark Lapierre <mlapierre@gitlab.com> | 2019-02-20 16:46:22 +0300 |
commit | 999a0ecaab404abd7ccda140620f413f5877adb6 (patch) | |
tree | 40fd20da90cd96e112d5f6cc5fac37ee7912de62 /qa | |
parent | b0006630d685db369bc29a0a1df979537174120b (diff) |
Added id to the namespace name generation
Removed quarantine tag from the squash merges test;
Diffstat (limited to 'qa')
-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 60836a7b98d..f146636c49a 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) |