Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
ddbb07f6
Commit
ddbb07f6
authored
Mar 26, 2021
by
Zamir Martins Filho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename each job for promoting a smoother
transition between Klar to Trivy
parent
4816f7ef
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
changelogs/unreleased/rename_to_promote_smoother_transition.yml
...logs/unreleased/rename_to_promote_smoother_transition.yml
+5
-0
ee/spec/lib/gitlab/ci/templates/container_scanning_gitlab_ci_yaml_spec.rb
...ab/ci/templates/container_scanning_gitlab_ci_yaml_spec.rb
+2
-2
lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml
...ab/ci/templates/Security/Container-Scanning.gitlab-ci.yml
+2
-2
No files found.
changelogs/unreleased/rename_to_promote_smoother_transition.yml
0 → 100644
View file @
ddbb07f6
---
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
View file @
ddbb07f6
...
@@ -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
...
...
lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml
View file @
ddbb07f6
...
@@ -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'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment