Merge branch 'qa-e2e-fix-secure-build-trace' into 'master'

Fix Secure tests using old build trace element

Closes #118429

See merge request gitlab-org/gitlab!21858

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

@@ -23,10 +23,6 @@ module QA
       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
-
         Flow::Login.sign_in
 
         @project = Resource::Project.fabricate_via_api! do |p|
@@ -63,8 +59,7 @@ module QA
 
         @project.visit!
         Page::Project::Menu.perform(&:click_ci_cd_pipelines)
-        Page::Project::Pipeline::Index.perform(&:click_on_latest_pipeline)
-        wait_for_job "dast"
+        Page::Project::Pipeline::Index.perform(&:wait_for_latest_pipeline_success)
 
         merge_request.visit!
       end
@@ -115,15 +110,6 @@ module QA
           expect(merge_request).to have_title remediable_vuln_name
         end
       end
-
-      def wait_for_job(job_name)
-        Page::Project::Pipeline::Show.perform do |pipeline|
-          pipeline.click_job(job_name)
-        end
-        Page::Project::Job::Show.perform do |job|
-          expect(job).to be_successful(timeout: 600)
-        end
-      end
     end
   end
 end

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

@@ -48,10 +48,6 @@ module QA
       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
-
         Flow::Login.sign_in
 
         @project = Resource::Project.fabricate_via_api! do |project|
@@ -82,9 +78,7 @@ module QA
         end
 
         Page::Project::Menu.perform(&:click_ci_cd_pipelines)
-        Page::Project::Pipeline::Index.perform(&:click_on_latest_pipeline)
-
-        wait_for_job "license_management"
+        Page::Project::Pipeline::Index.perform(&:wait_for_latest_pipeline_success)
       end
 
       it 'displays license approval status in the pipeline' do
@@ -100,14 +94,5 @@ module QA
         end
       end
     end
-
-    def wait_for_job(job_name)
-      Page::Project::Pipeline::Show.perform do |pipeline|
-        pipeline.click_job(job_name)
-      end
-      Page::Project::Job::Show.perform do |job|
-        expect(job).to be_successful(timeout: 600)
-      end
-    end
   end
 end

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

@@ -20,10 +20,6 @@ module QA
       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)