Keep supporting old job name, add drepecation notice and change changelog type.

doc/ci/examples/container_scanning.md

@@ -56,4 +56,11 @@ so, the CI/CD job must be named `container_scanning` and the artifact path must
 `gl-container-scanning-report.json`.
 [Learn more on container scanning results shown in merge requests](https://docs.gitlab.com/ee/user/project/merge_requests/container_scanning.html).
 
+>**Note:**
+Container Scanning was previously using `sast:container` for job name and
+`gl-sast-container-report.json` for the artifact name. While these old names
+are still maintained they have been deprecated with GitLab 11.0 and may be removed
+in next major release. You are advised to update your current `.gitlab-ci.yml`
+configuration to reflect that change.
+
 [ee]: https://about.gitlab.com/products/

doc/user/project/merge_requests/container_scanning.md

@@ -33,6 +33,13 @@ GitLab will then check this file and show the information inside the merge reque
 For more information on how the `container_scanning` job should look like, check the
 example on [analyzing a Docker image for vulnerabilities][cc-docs].
 
+>**Note:**
+Container Scanning was previously using `sast:container` for job name and
+`gl-sast-container-report.json` for the artifact name. While these old names
+are still maintained they have been deprecated with GitLab 11.0 and may be removed
+in next major release. You are advised to update your current `.gitlab-ci.yml`
+configuration to reflect that change.
+
 [ee-3672]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3672
 [ee]: https://about.gitlab.com/products/
 [ci]: ../../../ci/README.md

ee/app/models/ee/ci/build.rb

@@ -23,7 +23,7 @@ module EE
         scope :sast, -> { where(name: 'sast') }
         scope :dependency_scanning, -> { where(name: 'dependency_scanning') }
         scope :license_management, -> { where(name: 'license_management') }
-        scope :sast_container, -> { where(name: 'container_scanning') }
+        scope :sast_container, -> { where(name: %w[sast:container container_scanning]) }
         scope :dast, -> { where(name: 'dast') }
 
         after_save :stick_build_if_status_changed

ee/changelogs/unreleased/5778_rename_container_scanning_job_and_artifact.yml → ee/changelogs/unreleased/5778_rename_container_scanning_job_and_artifact-ee.yml

@@ -2,4 +2,4 @@
 title: Rename Container Scanning job and artifact
 merge_request: 5770
 author:
-type: changed
+type: deprecated

ee/spec/models/ci/pipeline_spec.rb

@@ -24,7 +24,7 @@ describe Ci::Pipeline do
     dependency_scanning_artifact: [Ci::Build::DEPENDENCY_SCANNING_FILE, 'dependency_scanning'],
     license_management_artifact: [Ci::Build::LICENSE_MANAGEMENT_FILE, 'license_management'],
     # sast_container_artifact is deprecated and replaced with container_scanning_artifact (#5778)
-    sast_container_artifact: [Ci::Build::SAST_CONTAINER_FILE, 'container_scanning'],
+    sast_container_artifact: [Ci::Build::SAST_CONTAINER_FILE, 'sast:container'],
     container_scanning_artifact: [Ci::Build::CONTAINER_SCANNING_FILE, 'container_scanning'],
     dast_artifact: [Ci::Build::DAST_FILE, 'dast']
   }.freeze
@@ -61,7 +61,7 @@ describe Ci::Pipeline do
     end
   end
 
-  %w(sast dast performance sast_container).each do |type|
+  %w(sast dast performance sast_container container_scanning).each do |type|
     method = "has_#{type}_data?"
 
     describe "##{method}" do
@@ -75,7 +75,7 @@ describe Ci::Pipeline do
     end
   end
 
-  %w(sast dast performance sast_container).each do |type|
+  %w(sast dast performance sast_container container_scanning).each do |type|
     method = "expose_#{type}_data?"
 
     describe "##{method}" do