Add latest changes from gitlab-org/gitlab@master

3 files changed, 7 insertions, 4 deletions

diff --git a/qa/qa/factories/pipelines.rb b/qa/qa/factories/pipelines.rb
index aa3a48fd034..0fac90c14a8 100644
--- a/qa/qa/factories/pipelines.rb
+++ b/qa/qa/factories/pipelines.rb
@@ -4,5 +4,6 @@ module QA
   FactoryBot.define do
     # https://docs.gitlab.com/ee/api/pipelines.html
     factory :pipeline, class: 'QA::Resource::Pipeline'
+    factory :pipeline_schedule, class: 'QA::Resource::PipelineSchedule'
   end
 end
diff --git a/qa/qa/resource/pipeline_schedules.rb b/qa/qa/resource/pipeline_schedule.rb
index 3d51bcdbce5..d22315d16d9 100644
--- a/qa/qa/resource/pipeline_schedules.rb
+++ b/qa/qa/resource/pipeline_schedule.rb
@@ -2,7 +2,7 @@
 
 module QA
   module Resource
-    class PipelineSchedules < Base
+    class PipelineSchedule < Base
       attribute :id
       attribute :ref
       attribute :description
diff --git a/qa/qa/specs/features/api/4_verify/cancel_pipeline_when_block_user_spec.rb b/qa/qa/specs/features/api/4_verify/cancel_pipeline_when_block_user_spec.rb
index 13bc91f2ad4..e56ff1cf83f 100644
--- a/qa/qa/specs/features/api/4_verify/cancel_pipeline_when_block_user_spec.rb
+++ b/qa/qa/specs/features/api/4_verify/cancel_pipeline_when_block_user_spec.rb
@@ -13,9 +13,11 @@ module QA
       before do
         project.add_member(user, Resource::Members::AccessLevel::MAINTAINER)
 
-        Resource::PipelineSchedules.fabricate_via_api! do |schedule|
-          schedule.api_client = user_api_client
-          schedule.project = project
+        # Retry is needed due to delays with project authorization updates
+        # Long term solution to accessing the status of a project authorization update
+        # has been proposed in https://gitlab.com/gitlab-org/gitlab/-/issues/393369
+        Support::Retrier.retry_on_exception(max_attempts: 60, sleep_interval: 1) do
+          create(:pipeline_schedule, api_client: user_api_client, project: project)
         end
 
         Support::Waiter.wait_until { !pipeline_schedule[:id].nil? && pipeline_schedule[:active] == true }