3 files changed, 56 insertions, 1 deletions
diff --git a/app/services/ci/job_artifacts/create_service.rb b/app/services/ci/job_artifacts/create_service.rb
index af56eb221d5..3dc097a8603 100644
--- a/app/services/ci/job_artifacts/create_service.rb
+++ b/app/services/ci/job_artifacts/create_service.rb
@@ -80,7 +80,7 @@ module Ci
           Gitlab::CurrentSettings.current_application_settings.default_artifacts_expire_in
 
         artifact_attributes = {
-          job_id: job.id,
+          job: job,
           project: project,
           expire_in: expire_in
         }
diff --git a/app/services/ci/job_artifacts/delete_service.rb b/app/services/ci/job_artifacts/delete_service.rb
new file mode 100644
index 00000000000..65cae03312e
--- /dev/null
+++ b/app/services/ci/job_artifacts/delete_service.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Ci
+  module JobArtifacts
+    class DeleteService
+      include BaseServiceUtility
+
+      def initialize(build)
+        @build = build
+      end
+
+      def execute
+        if build.project.refreshing_build_artifacts_size?
+          Gitlab::ProjectStatsRefreshConflictsLogger.warn_artifact_deletion_during_stats_refresh(
+            method: 'Ci::JobArtifacts::DeleteService#execute',
+            project_id: build.project_id
+          )
+        end
+
+        # fix_expire_at is false because in this case we want to explicitly delete the job artifacts
+        # this flag is a workaround that will be removed with https://gitlab.com/gitlab-org/gitlab/-/issues/355833
+        Ci::JobArtifacts::DestroyBatchService.new(build.job_artifacts.erasable, fix_expire_at: false).execute
+
+        ServiceResponse.success
+      end
+
+      private
+
+      attr_reader :build
+    end
+  end
+end
diff --git a/app/services/ci/job_artifacts/track_artifact_report_service.rb b/app/services/ci/job_artifacts/track_artifact_report_service.rb
new file mode 100644
index 00000000000..1be1d98394f
--- /dev/null
+++ b/app/services/ci/job_artifacts/track_artifact_report_service.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Ci
+  module JobArtifacts
+    class TrackArtifactReportService
+      include Gitlab::Utils::UsageData
+
+      REPORT_TRACKED = %i[test].freeze
+
+      def execute(pipeline)
+        REPORT_TRACKED.each do |report|
+          if pipeline.complete_and_has_reports?(Ci::JobArtifact.of_report_type(report))
+            track_usage_event(event_name(report), pipeline.user_id)
+          end
+        end
+      end
+
+      def event_name(report)
+        "i_testing_#{report}_report_uploaded"
+      end
+    end
+  end
+end