Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 2 deletions

diff --git a/scripts/api/get_job_id.rb b/scripts/api/get_job_id.rb
index 166c9198951..c32299706ba 100755
--- a/scripts/api/get_job_id.rb
+++ b/scripts/api/get_job_id.rb
@@ -10,6 +10,7 @@ class JobFinder
     pipeline_query: {}.freeze,
     job_query: {}.freeze
   ).freeze
+  MAX_PIPELINES_TO_ITERATE = 200
 
   def initialize(options)
     @project = options.delete(:project)
@@ -41,8 +42,11 @@ class JobFinder
   def find_job_with_artifact
     return if artifact_path.nil?
 
-    client.pipelines(project, pipeline_query_params).auto_paginate do |pipeline|
+    client.pipelines(project, pipeline_query_params).paginate_with_limit(MAX_PIPELINES_TO_ITERATE) do |pipeline|
+      $stderr.puts "Iterating over #{pipeline}" # rubocop:disable Style/StderrPuts
       client.pipeline_jobs(project, pipeline.id, job_query_params).auto_paginate do |job|
+        next if job_name && !found_job_by_name?(job)
+
         return job if found_job_with_artifact?(job) # rubocop:disable Cop/AvoidReturnFromBlocks
       end
     end
@@ -53,7 +57,7 @@ class JobFinder
   def find_job_with_filtered_pipelines
     return if pipeline_query.empty?
 
-    client.pipelines(project, pipeline_query_params).auto_paginate do |pipeline|
+    client.pipelines(project, pipeline_query_params).paginate_with_limit(MAX_PIPELINES_TO_ITERATE) do |pipeline|
       client.pipeline_jobs(project, pipeline.id, job_query_params).auto_paginate do |job|
         return job if found_job_by_name?(job) # rubocop:disable Cop/AvoidReturnFromBlocks
       end