Added id to the namespace name generation
Removed quarantine tag from the squash merges test;
This commit is contained in:
parent
b0006630d6
commit
999a0ecaab
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue