Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 25 insertions, 0 deletions

diff --git a/app/services/ci/enqueue_job_service.rb b/app/services/ci/enqueue_job_service.rb
new file mode 100644
index 00000000000..9e3bea3fd28
--- /dev/null
+++ b/app/services/ci/enqueue_job_service.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Ci
+  class EnqueueJobService
+    attr_accessor :job, :current_user, :variables
+
+    def initialize(job, current_user:, variables: nil)
+      @job = job
+      @current_user = current_user
+      @variables = variables
+    end
+
+    def execute(&transition)
+      job.user = current_user
+      job.job_variables_attributes = variables if variables
+
+      transition ||= ->(job) { job.enqueue! }
+      Gitlab::OptimisticLocking.retry_lock(job, name: 'ci_enqueue_job', &transition)
+
+      ResetSkippedJobsService.new(job.project, current_user).execute(job)
+
+      job
+    end
+  end
+end