Commit 68f9eebd authored by Thong Kuah's avatar Thong Kuah

New CI keyword for cluster applications artifact

This keyword is intended for passing a report of installed applications
from the cluster to GitLab CI, based on the Helm v2 list json output.
parent 3442487e
...@@ -35,7 +35,8 @@ module Ci ...@@ -35,7 +35,8 @@ module Ci
lsif: 'lsif.json', lsif: 'lsif.json',
dotenv: '.env', dotenv: '.env',
cobertura: 'cobertura-coverage.xml', cobertura: 'cobertura-coverage.xml',
terraform: 'tfplan.json' terraform: 'tfplan.json',
cluster_applications: 'gl-cluster-applications.json'
}.freeze }.freeze
INTERNAL_TYPES = { INTERNAL_TYPES = {
...@@ -52,6 +53,7 @@ module Ci ...@@ -52,6 +53,7 @@ module Ci
lsif: :gzip, lsif: :gzip,
dotenv: :gzip, dotenv: :gzip,
cobertura: :gzip, cobertura: :gzip,
cluster_applications: :gzip,
# All these file formats use `raw` as we need to store them uncompressed # All these file formats use `raw` as we need to store them uncompressed
# for Frontend to fetch the files and do analysis # for Frontend to fetch the files and do analysis
...@@ -153,7 +155,8 @@ module Ci ...@@ -153,7 +155,8 @@ module Ci
dotenv: 16, dotenv: 16,
cobertura: 17, cobertura: 17,
terraform: 18, # Transformed json terraform: 18, # Transformed json
accessibility: 19 accessibility: 19,
cluster_applications: 20
} }
enum file_format: { enum file_format: {
......
---
title: Add support for cluster applications CI artifact report
merge_request: 28866
author:
type: added
...@@ -14,7 +14,7 @@ module Gitlab ...@@ -14,7 +14,7 @@ module Gitlab
ALLOWED_KEYS = ALLOWED_KEYS =
%i[junit codequality sast dependency_scanning container_scanning %i[junit codequality sast dependency_scanning container_scanning
dast performance license_management license_scanning metrics lsif dast performance license_management license_scanning metrics lsif
dotenv cobertura terraform accessibility].freeze dotenv cobertura terraform accessibility cluster_applications].freeze
attributes ALLOWED_KEYS attributes ALLOWED_KEYS
...@@ -38,6 +38,7 @@ module Gitlab ...@@ -38,6 +38,7 @@ module Gitlab
validates :cobertura, array_of_strings_or_string: true validates :cobertura, array_of_strings_or_string: true
validates :terraform, array_of_strings_or_string: true validates :terraform, array_of_strings_or_string: true
validates :accessibility, 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
end end
......
...@@ -48,6 +48,7 @@ describe Gitlab::Ci::Config::Entry::Reports do ...@@ -48,6 +48,7 @@ describe Gitlab::Ci::Config::Entry::Reports do
:cobertura | 'cobertura-coverage.xml' :cobertura | 'cobertura-coverage.xml'
:terraform | 'tfplan.json' :terraform | 'tfplan.json'
:accessibility | 'gl-accessibility.json' :accessibility | 'gl-accessibility.json'
:cluster_applications | 'gl-cluster-applications.json'
end end
with_them do with_them do
......
...@@ -34,7 +34,7 @@ describe Ci::RetryBuildService do ...@@ -34,7 +34,7 @@ describe Ci::RetryBuildService do
job_artifacts_container_scanning job_artifacts_dast job_artifacts_container_scanning job_artifacts_dast
job_artifacts_license_management job_artifacts_license_scanning job_artifacts_license_management job_artifacts_license_scanning
job_artifacts_performance job_artifacts_lsif 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_artifacts_codequality job_artifacts_metrics scheduled_at
job_variables waiting_for_resource_at job_artifacts_metrics_referee job_variables waiting_for_resource_at job_artifacts_metrics_referee
job_artifacts_network_referee job_artifacts_dotenv job_artifacts_network_referee job_artifacts_dotenv
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment