Commit d5eb2bad authored by Robert Speicher's avatar Robert Speicher

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
parents 0767b9e2 ddbb07f6
---
title: Rename jobs to promote a smoother transition between Klar and Trivy based scanners
merge_request: 57593
author:
type: changed
...@@ -34,7 +34,7 @@ RSpec.describe 'Container-Scanning.gitlab-ci.yml' do ...@@ -34,7 +34,7 @@ RSpec.describe 'Container-Scanning.gitlab-ci.yml' do
context 'by default' do context 'by default' do
it 'includes job' 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
end end
...@@ -44,7 +44,7 @@ RSpec.describe 'Container-Scanning.gitlab-ci.yml' do ...@@ -44,7 +44,7 @@ RSpec.describe 'Container-Scanning.gitlab-ci.yml' do
end end
it 'includes job' do 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
end end
......
...@@ -24,7 +24,7 @@ variables: ...@@ -24,7 +24,7 @@ variables:
container_scanning: gl-container-scanning-report.json container_scanning: gl-container-scanning-report.json
dependencies: [] dependencies: []
container_scanning_deprecated: container_scanning:
extends: .cs_common extends: .cs_common
variables: variables:
# By default, use the latest clair vulnerabilities database, however, allow it to be overridden here with a specific image # 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: ...@@ -44,7 +44,7 @@ container_scanning_deprecated:
$GITLAB_FEATURES =~ /\bcontainer_scanning\b/ && $GITLAB_FEATURES =~ /\bcontainer_scanning\b/ &&
$CS_MAJOR_VERSION =~ /^[0-3]$/ $CS_MAJOR_VERSION =~ /^[0-3]$/
container_scanning: container_scanning_new:
extends: .cs_common extends: .cs_common
variables: variables:
CS_PROJECT: 'container-scanning' CS_PROJECT: 'container-scanning'
......
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