Merge branch...

Merge branch '49021-preserve-test-run-artifacts-when-running-gitlab-qa-multiple-times' into 'master'

Resolve "Preserve test run artifacts when running gitlab-qa multiple times"

Closes #49021

See merge request gitlab-org/gitlab-ce!20495

qa/qa/runtime/browser.rb

@@ -85,6 +85,10 @@ module QA
           driver.browser.save_screenshot(path)
         end
+        Capybara::Screenshot.register_filename_prefix_formatter(:rspec) do |example|
+          File.join(QA::Runtime::Namespace.name, example.file_path.sub('./qa/specs/features/', ''))
+        end
+
         Capybara.configure do |config|
           config.default_driver = :chrome
           config.javascript_driver = :chrome

qa/qa/runtime/namespace.rb

@@ -8,7 +8,7 @@ module QA
       end
       def name
-        'qa-test-' + time.strftime('%d-%m-%Y-%H-%M-%S')
+        "qa-test-#{time.strftime('%Y-%m-%d-%Y-%H-%M-%S')}"
       end
       def path