kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Added id to the namespace name generation

Browse source 
Removed quarantine tag from the squash merges test;
This commit is contained in:
Tomislav Nikic 2019-02-20 13:46:22 +00:00 committed by Mark Lapierre
parent b0006630d6
commit 999a0ecaab
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qa/qa/runtime/namespace.rb
View file

@ -8,7 +8,9 @@ module QA
end end
def name 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 end
def path def path

2
qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb
View file

@ -2,7 +2,7 @@
module QA module QA
# Failure issue: https://gitlab.com/gitlab-org/quality/staging/issues/31 # Failure issue: https://gitlab.com/gitlab-org/quality/staging/issues/31
context 'Create', :quarantine do context 'Create' do
describe 'Merge request squashing' do describe 'Merge request squashing' do
it 'user squashes commits while merging' do it 'user squashes commits while merging' do
Runtime::Browser.visit(:gitlab, Page::Main::Login) Runtime::Browser.visit(:gitlab, Page::Main::Login)