Add latest changes from gitlab-org/gitlab@master

3 files changed, 21 insertions, 9 deletions

diff --git a/qa/qa/resource/events/base.rb b/qa/qa/resource/events/base.rb
index d96f5a30f05..f01fa871726 100644
--- a/qa/qa/resource/events/base.rb
+++ b/qa/qa/resource/events/base.rb
@@ -4,7 +4,7 @@ module QA
   module Resource
     module Events
       MAX_WAIT = 60
-      RAISE_ON_FAILURE = true
+      RAISE_ON_FAILURE = false
 
       EventNotFoundError = Class.new(RuntimeError)
 
diff --git a/qa/qa/resource/events/project.rb b/qa/qa/resource/events/project.rb
index 2560e6b9e3b..410edd417c1 100644
--- a/qa/qa/resource/events/project.rb
+++ b/qa/qa/resource/events/project.rb
@@ -25,6 +25,10 @@ module QA
           wait_for_event do
             events(action: 'pushed').any? { |event| event.dig(:push_data, :commit_title) == commit_message }
           end
+        rescue EventNotFoundError
+          QA::Runtime::Logger.debug("Push events: #{events(action: 'pushed')}")
+
+          raise
         end
 
         def wait_for_push_new_branch(branch_name = self.default_branch)
diff --git a/qa/qa/specs/features/api/3_create/merge_request/push_options_mwps_spec.rb b/qa/qa/specs/features/api/3_create/merge_request/push_options_mwps_spec.rb
index 164507d8fca..019bcfbbf34 100644
--- a/qa/qa/specs/features/api/3_create/merge_request/push_options_mwps_spec.rb
+++ b/qa/qa/specs/features/api/3_create/merge_request/push_options_mwps_spec.rb
@@ -25,8 +25,9 @@ module QA
         end
       end
 
-      after do
+      after do |example|
         runner.remove_via_api!
+        project.remove_via_api! unless example.exception
       end
 
       it 'sets merge when pipeline succeeds', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1240' do
@@ -106,15 +107,22 @@ module QA
         expect(merge_request).not_to be_nil, "There was a problem creating the merge request"
         expect(merge_request[:merge_when_pipeline_succeeds]).to be true
 
-        merge_request = Support::Waiter.wait_until(sleep_interval: 5) do
-          mr = Resource::MergeRequest.fabricate_via_api! do |mr|
-            mr.project = project
-            mr.iid = merge_request[:iid]
-          end
+        mr = nil
+        begin
+          merge_request = Support::Retrier.retry_until(max_duration: 60, sleep_interval: 5, message: 'The merge request was not merged') do
+            mr = Resource::MergeRequest.fabricate_via_api! do |mr|
+              mr.project = project
+              mr.iid = merge_request[:iid]
+            end
+
+            next unless mr.state == 'merged'
 
-          next unless mr.state == 'merged'
+            mr
+          end
+        rescue Support::Repeater::WaitExceededError
+          QA::Runtime::Logger.debug("MR: #{mr.api_response}")
 
-          mr
+          raise
         end
 
         expect(merge_request.state).to eq('merged')