Commit f1e2b02e authored by Mark Lapierre's avatar Mark Lapierre Committed by GitLab Release Tools Bot

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 9c7363db)

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
parent 043f7a83
......@@ -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)
......
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