CiJob

Fixing double enqueue error

Signed-off-by: Rodrigo Nardi <[email protected]>

lib/github/retry.rb

@@ -58,10 +58,15 @@ def create_ci_jobs(check_suite)
 
       enqueued_stages(check_suite, github_check)
 
+      enqueued_failure_tests(check_suite, github_check)
+    end
+
+    def enqueued_failure_tests(check_suite, github)
       check_suite.ci_jobs.skip_stages.where.not(status: :success).each do |ci_job|
         next if ci_job.checkout_code?
 
-        ci_job.enqueue(github_check)
+        logger(Logger::WARN, "Enqueue CiJob: #{ci_job.inspect}")
+        ci_job.enqueue(github)
         ci_job.update(retry: ci_job.retry + 1)
 
         logger(Logger::WARN, "Stopping Job: #{ci_job.job_ref}")
@@ -71,7 +76,7 @@ def create_ci_jobs(check_suite)
 
     def enqueued_stages(check_suite, github_check)
       check_suite.ci_jobs.stages.each do |ci_job|
-        logger(Logger::WARN, "Retrying #{ci_job.inspect}")
+        logger(Logger::WARN, "Enqueue stages: #{ci_job.inspect}")
         ci_job.enqueue(github_check)
         ci_job.update(retry: ci_job.retry + 1)
       end

lib/models/ci_job.rb

@@ -52,39 +52,49 @@ def enqueue(github, output = {})
   end
 
   def in_progress(github, output = {})
-    check_run = save_check_run(github)
-    github.in_progress(check_run.id, output)
+    create_github_check
 
-    update(check_ref: check_run.id, status: :in_progress)
+    github.in_progress(check_ref, output)
+    update(status: :in_progress)
   end
 
   def cancelled(github, output = {})
+    create_github_check
+
     github.cancelled(check_ref, output)
 
     update(status: :cancelled)
   end
 
   def failure(github, output = {})
+    create_github_check
+
     github.failure(check_ref, output)
 
     update(status: :failure)
   end
 
   def success(github, output = {})
+    create_github_check
     github.success(check_ref, output)
 
     update(status: :success)
   end
 
   def skipped(github, output = {})
+    create_github_check
+
     github.skipped(check_ref, output)
 
     update(status: :skipped)
   end
 
   private
 
-  def save_check_run(github)
-    github.create(name)
+  def create_github_check
+    return unless check_ref.nil?
+
+    check_run = github.create(name)
+    update(check_ref: check_run.id)
   end
 end