Merge branch 'rename_to_promote_smoother_transition' into 'master'

Rename jobs to promote a smoother transition between Klar and Trivy based scanners

See merge request gitlab-org/gitlab!57593

changelogs/unreleased/rename_to_promote_smoother_transition.yml

+---
+title: Rename jobs to promote a smoother transition between Klar and Trivy based scanners
+merge_request: 57593
+author:
+type: changed

ee/spec/lib/gitlab/ci/templates/container_scanning_gitlab_ci_yaml_spec.rb

@@ -34,7 +34,7 @@ RSpec.describe 'Container-Scanning.gitlab-ci.yml' do
 
       context 'by default' do
         it 'includes job' do
-          expect(build_names).to match_array(%w[container_scanning_deprecated])
+          expect(build_names).to match_array(%w[container_scanning])
         end
       end
 
@@ -44,7 +44,7 @@ RSpec.describe 'Container-Scanning.gitlab-ci.yml' do
         end
 
         it 'includes job' do
-          expect(build_names).to match_array(%w[container_scanning])
+          expect(build_names).to match_array(%w[container_scanning_new])
         end
       end
 

lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml

@@ -24,7 +24,7 @@ variables:
       container_scanning: gl-container-scanning-report.json
   dependencies: []
 
-container_scanning_deprecated:
+container_scanning:
   extends: .cs_common
   variables:
     # By default, use the latest clair vulnerabilities database, however, allow it to be overridden here with a specific image
@@ -44,7 +44,7 @@ container_scanning_deprecated:
           $GITLAB_FEATURES =~ /\bcontainer_scanning\b/ &&
           $CS_MAJOR_VERSION =~ /^[0-3]$/
 
-container_scanning:
+container_scanning_new:
   extends: .cs_common
   variables:
     CS_PROJECT: 'container-scanning'