Merge branch 'gy-qa-job-log-workaround' into 'master'

Workaround for QA tests when job_log_json flag is enabled

Closes #34901, #34900, and #34899

See merge request gitlab-org/gitlab!19145

qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb

@@ -5,7 +5,15 @@ require 'digest/sha1'
 module QA
   context 'Release', :docker do
     describe 'Git clone using a deploy key' do
+      after do
+        Runtime::Feature.enable('job_log_json') if @job_log_json_flag_enabled
+      end
+
       before do
+        # Handle WIP Job Logs flag - https://gitlab.com/gitlab-org/gitlab/issues/31162
+        @job_log_json_flag_enabled = Runtime::Feature.enabled?('job_log_json')
+        Runtime::Feature.disable('job_log_json') if @job_log_json_flag_enabled
+
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
         Page::Main::Login.perform(&:sign_in_using_credentials)
 

qa/qa/specs/features/ee/browser_ui/secure/create_merge_request_with_secure_spec.rb

@@ -13,11 +13,17 @@ module QA
 
       after do
         Service::DockerRun::GitlabRunner.new(@executor).remove!
+
+        Runtime::Feature.enable('job_log_json') if @job_log_json_flag_enabled
       end
 
       before do
         @executor = "qa-runner-#{Time.now.to_i}"
 
+        # Handle WIP Job Logs flag - https://gitlab.com/gitlab-org/gitlab/issues/31162
+        @job_log_json_flag_enabled = Runtime::Feature.enabled?('job_log_json')
+        Runtime::Feature.disable('job_log_json') if @job_log_json_flag_enabled
+
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
         Page::Main::Login.perform(&:sign_in_using_credentials)
 

qa/qa/specs/features/ee/browser_ui/secure/security_reports_spec.rb

@@ -19,11 +19,17 @@ module QA
     describe 'Security Reports' do
       after do
         Service::DockerRun::GitlabRunner.new(@executor).remove!
+
+        Runtime::Feature.enable('job_log_json') if @job_log_json_flag_enabled
       end
 
       before do
         @executor = "qa-runner-#{Time.now.to_i}"
 
+        # Handle WIP Job Logs flag - https://gitlab.com/gitlab-org/gitlab/issues/31162
+        @job_log_json_flag_enabled = Runtime::Feature.enabled?('job_log_json')
+        Runtime::Feature.disable('job_log_json') if @job_log_json_flag_enabled
+
         Runtime::Browser.visit(:gitlab, Page::Main::Login)
         Page::Main::Login.perform(&:sign_in_using_credentials)