Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

1 files changed, 15 insertions, 6 deletions

diff --git a/app/graphql/mutations/ci/job/artifacts_destroy.rb b/app/graphql/mutations/ci/job/artifacts_destroy.rb
index c27ab9c4d89..34c58fc1240 100644
--- a/app/graphql/mutations/ci/job/artifacts_destroy.rb
+++ b/app/graphql/mutations/ci/job/artifacts_destroy.rb
@@ -25,12 +25,21 @@ module Mutations
         def resolve(id:)
           job = authorized_find!(id: id)
 
-          result = ::Ci::JobArtifacts::DestroyBatchService.new(job.job_artifacts, pick_up_at: Time.current).execute
-          {
-            job: job,
-            destroyed_artifacts_count: result[:destroyed_artifacts_count],
-            errors: Array(result[:errors])
-          }
+          result = ::Ci::JobArtifacts::DeleteService.new(job).execute
+
+          if result.success?
+            {
+              job: job,
+              destroyed_artifacts_count: result.payload[:destroyed_artifacts_count],
+              errors: Array(result.payload[:errors])
+            }
+          else
+            {
+              job: job,
+              destroyed_artifacts_count: 0,
+              errors: Array(result.message)
+            }
+          end
         end
       end
     end