Merge branch '325711-update-blocked-pipeline-test' into 'master'

Update pipeline's config and status wait condition

See merge request gitlab-org/gitlab!59429

qa/qa/specs/features/browser_ui/4_verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb

@@ -39,6 +39,7 @@ module QA
                   needs: [test_blocked_pipeline]
                   script: echo do not click me
                   when: manual
+                  allow_failure: false
 
                 dummy_job:
                   stage: deploy
@@ -71,8 +72,9 @@ module QA
 
       it 'can still merge MR successfully', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/971' do
         Page::MergeRequest::Show.perform do |show|
-          show.wait_until(reload: false) { show.has_pipeline_status?('running') }
-          show.merge_immediately!
+          # waiting for manual action status shows status badge 'blocked' on pipelines page
+          show.wait_until(reload: false) { show.has_pipeline_status?('waiting for manual action') }
+          show.merge!
 
           expect(show).to be_merged
         end