Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 1 deletions

diff --git a/qa/qa/runtime/env.rb b/qa/qa/runtime/env.rb
index 259ec94985d..1fd097d0acf 100644
--- a/qa/qa/runtime/env.rb
+++ b/qa/qa/runtime/env.rb
@@ -492,6 +492,10 @@ module QA
         ENV.fetch('MAX_CAPYBARA_WAIT_TIME', 10).to_i
       end
 
+      def use_public_ip_api?
+        enabled?(ENV['QA_USE_PUBLIC_IP_API'], default: false)
+      end
+
       private
 
       def remote_grid_credentials
diff --git a/qa/qa/runtime/ip_address.rb b/qa/qa/runtime/ip_address.rb
index 657dc789cff..fcb6db750bb 100644
--- a/qa/qa/runtime/ip_address.rb
+++ b/qa/qa/runtime/ip_address.rb
@@ -13,7 +13,10 @@ module QA
       def fetch_current_ip_address
         # When running on CI against a live environment such as staging.gitlab.com,
         # we use the public facing IP address
-        ip_address = if Env.running_in_ci? && !URI.parse(Scenario.gitlab_address).host.include?('.test')
+        non_test_host = !URI.parse(Scenario.gitlab_address).host.include?('.test')
+        has_no_public_ip = Env.running_in_ci? || Env.use_public_ip_api?
+
+        ip_address = if has_no_public_ip && non_test_host
                        response = get(PUBLIC_IP_ADDRESS_API)
                        raise HostUnreachableError, "#{PUBLIC_IP_ADDRESS_API} is unreachable" unless response.code == Support::API::HTTP_STATUS_OK