Merge branch 'cluster-applications-artifact' into 'master'

CI artifact report keyword for cluster applications

See merge request gitlab-org/gitlab!28866

app/models/ci/job_artifact.rb

@@ -35,7 +35,8 @@ module Ci
       lsif: 'lsif.json',
       dotenv: '.env',
       cobertura: 'cobertura-coverage.xml',
-      terraform: 'tfplan.json'
+      terraform: 'tfplan.json',
+      cluster_applications: 'gl-cluster-applications.json'
     }.freeze
 
     INTERNAL_TYPES = {
@@ -52,6 +53,7 @@ module Ci
       lsif: :gzip,
       dotenv: :gzip,
       cobertura: :gzip,
+      cluster_applications: :gzip,
 
       # All these file formats use `raw` as we need to store them uncompressed
       # for Frontend to fetch the files and do analysis
@@ -153,7 +155,8 @@ module Ci
       dotenv: 16,
       cobertura: 17,
       terraform: 18, # Transformed json
-      accessibility: 19
+      accessibility: 19,
+      cluster_applications: 20
     }
 
     enum file_format: {

changelogs/unreleased/cluster-applications-artifact.yml

+---
+title: Add support for cluster applications CI artifact report
+merge_request: 28866
+author:
+type: added

lib/gitlab/ci/config/entry/reports.rb

@@ -14,7 +14,7 @@ module Gitlab
           ALLOWED_KEYS =
             %i[junit codequality sast dependency_scanning container_scanning
                dast performance license_management license_scanning metrics lsif
-               dotenv cobertura terraform accessibility].freeze
+               dotenv cobertura terraform accessibility cluster_applications].freeze
 
           attributes ALLOWED_KEYS
 
@@ -38,6 +38,7 @@ module Gitlab
               validates :cobertura, array_of_strings_or_string: true
               validates :terraform, array_of_strings_or_string: true
               validates :accessibility, array_of_strings_or_string: true
+              validates :cluster_applications, array_of_strings_or_string: true
             end
           end
 

spec/lib/gitlab/ci/config/entry/reports_spec.rb

@@ -48,6 +48,7 @@ describe Gitlab::Ci::Config::Entry::Reports do
         :cobertura | 'cobertura-coverage.xml'
         :terraform | 'tfplan.json'
         :accessibility | 'gl-accessibility.json'
+        :cluster_applications | 'gl-cluster-applications.json'
       end
 
       with_them do

spec/services/ci/retry_build_service_spec.rb

@@ -34,7 +34,7 @@ describe Ci::RetryBuildService do
        job_artifacts_container_scanning job_artifacts_dast
        job_artifacts_license_management job_artifacts_license_scanning
        job_artifacts_performance job_artifacts_lsif
-       job_artifacts_terraform
+       job_artifacts_terraform job_artifacts_cluster_applications
        job_artifacts_codequality job_artifacts_metrics scheduled_at
        job_variables waiting_for_resource_at job_artifacts_metrics_referee
        job_artifacts_network_referee job_artifacts_dotenv