Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

1 files changed, 12 insertions, 0 deletions

diff --git a/qa/qa/runtime/env.rb b/qa/qa/runtime/env.rb
index f7aca2571c9..1fd097d0acf 100644
--- a/qa/qa/runtime/env.rb
+++ b/qa/qa/runtime/env.rb
@@ -291,6 +291,14 @@ module QA
         ENV['JIRA_HOSTNAME']
       end
 
+      def jenkins_admin_username
+        ENV.fetch('QA_JENKINS_USER', 'administrator')
+      end
+
+      def jenkins_admin_password
+        ENV.fetch('QA_JENKINS_PASS', 'password')
+      end
+
       # this is set by the integrations job
       # which will allow bidirectional communication
       # between the app and the specs container
@@ -484,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