Adopt Git style URI

2 files changed, 15 insertions, 1 deletions

diff --git a/qa/qa/git/repository.rb b/qa/qa/git/repository.rb
index 8f999511d58..606fc66b4d5 100644
--- a/qa/qa/git/repository.rb
+++ b/qa/qa/git/repository.rb
@@ -1,3 +1,4 @@
+require 'cgi'
 require 'uri'
 
 module QA
@@ -5,6 +6,19 @@ module QA
     class Repository
       include Scenario::Actable
 
+      # See: config/initializers/1_settings.rb
+      # Settings#build_gitlab_shell_ssh_path_prefix
+      def self.parse_uri(git_uri)
+        if git_uri.start_with?('ssh://')
+          URI.parse(git_uri)
+        else
+          *rest, path = git_uri.split(':')
+          # Host cannot have : so we'll need to escape it
+          user_host = rest.join('%3A').sub(/\A\[(.+)\]\z/, '\1')
+          URI.parse("ssh://#{user_host}/#{path}")
+        end
+      end
+
       def self.perform(*args)
         Dir.mktmpdir do |dir|
           Dir.chdir(dir) { super }
diff --git a/qa/qa/specs/features/cicd/pull_with_deploy_key_spec.rb b/qa/qa/specs/features/cicd/pull_with_deploy_key_spec.rb
index 39c600aee87..c1fa8d5b58a 100644
--- a/qa/qa/specs/features/cicd/pull_with_deploy_key_spec.rb
+++ b/qa/qa/specs/features/cicd/pull_with_deploy_key_spec.rb
@@ -45,7 +45,7 @@ module QA
         repository_location
       end
 
-      repository_uri = URI.parse(repository_url)
+      repository_uri = Git::Repository.parse_uri(repository_url)
 
       gitlab_ci =
         <<~YAML