Merge branch 'dmytro.golovchenko-master-patch-11572' into 'master'

Fix for issue 465876, added annotations to reports in ci.json

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/155478



Merged-by: Miranda Fluharty <mfluharty@gitlab.com>
Approved-by: Miranda Fluharty <mfluharty@gitlab.com>
Reviewed-by: Miranda Fluharty <mfluharty@gitlab.com>
Co-authored-by: Dmytro Golovchenko <dmytro.golovchenko@luminartech.com>

app/assets/javascripts/editor/schema/ci.json

@@ -259,6 +259,10 @@
           "markdownDescription": "Reports will be uploaded as artifacts, and often displayed in the Gitlab UI, such as in merge requests. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#artifactsreports).",
           "additionalProperties": false,
           "properties": {
+            "annotations": {
+              "type": "string",
+              "description": "Path to JSON file with annotations report."
+            },
             "junit": {
               "description": "Path for file(s) that should be parsed as JUnit XML result",
               "oneOf": [

spec/frontend/editor/schema/ci/yaml_tests/negative_tests/artifacts.yml

@@ -76,3 +76,8 @@ artifacts-access-all:
 artifacts-access-invalid-value:
   artifacts:
     access: random
+
+annotations-report-annotations-not-string:
+  artifacts:
+    reports:
+      annotations: 1

spec/frontend/editor/schema/ci/yaml_tests/positive_tests/artifacts.yml

@@ -63,3 +63,8 @@ artifacts-access-all:
 artifacts-access-none:
   artifacts:
     access: none
+
+annotations-report-annotations-normal:
+  artifacts:
+    reports:
+      annotations: upload_report.json