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
ecc55918
Commit
ecc55918
authored
May 08, 2020
by
Desiree Chevalier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update specs to use license scanning
parent
0b5598be
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
9 deletions
+9
-9
qa/qa/ee/fixtures/secure_license_files/.gitlab-ci.yml
qa/qa/ee/fixtures/secure_license_files/.gitlab-ci.yml
+3
-3
qa/qa/ee/fixtures/secure_license_files/gl-license-scanning-report.json
...ures/secure_license_files/gl-license-scanning-report.json
+0
-0
qa/qa/ee/fixtures/secure_premade_reports/.gitlab-ci.yml
qa/qa/ee/fixtures/secure_premade_reports/.gitlab-ci.yml
+3
-3
qa/qa/ee/fixtures/secure_premade_reports/gl-license-scanning-report.json
...es/secure_premade_reports/gl-license-scanning-report.json
+0
-0
qa/qa/specs/features/ee/browser_ui/secure/license_compliance_spec.rb
.../features/ee/browser_ui/secure/license_compliance_spec.rb
+1
-1
qa/qa/specs/features/ee/browser_ui/secure/merge_request_license_widget_spec.rb
...ee/browser_ui/secure/merge_request_license_widget_spec.rb
+2
-2
No files found.
qa/qa/ee/fixtures/secure_license_files/.gitlab-ci.yml
View file @
ecc55918
include
:
template
:
License-
Management
.gitlab-ci.yml
template
:
License-
Scanning
.gitlab-ci.yml
license_
management
:
license_
scanning
:
tags
:
-
qa
-
test
...
...
@@ -9,4 +9,4 @@ license_management:
-
echo "Skipped"
artifacts
:
reports
:
license_
management
:
gl-license-management
-report.json
license_
scanning
:
gl-license-scanning
-report.json
qa/qa/ee/fixtures/secure_license_files/gl-license-
management
-report.json
→
qa/qa/ee/fixtures/secure_license_files/gl-license-
scanning
-report.json
View file @
ecc55918
File moved
qa/qa/ee/fixtures/secure_premade_reports/.gitlab-ci.yml
View file @
ecc55918
...
...
@@ -3,7 +3,7 @@ include:
template
:
Container-Scanning.gitlab-ci.yml
template
:
SAST.gitlab-ci.yml
template
:
DAST.gitlab-ci.yml
template
:
License-
Management
.gitlab-ci.yml
template
:
License-
Scanning
.gitlab-ci.yml
dependency_scanning
:
tags
:
...
...
@@ -50,7 +50,7 @@ dast:
reports
:
dast
:
gl-dast-report.json
license_
management
:
license_
scanning
:
tags
:
-
qa
-
test
...
...
@@ -58,4 +58,4 @@ license_management:
-
echo "Skipped"
artifacts
:
reports
:
license_
management
:
gl-license-management
-report.json
license_
scanning
:
gl-license-scanning
-report.json
qa/qa/ee/fixtures/secure_premade_reports/gl-license-
management
-report.json
→
qa/qa/ee/fixtures/secure_premade_reports/gl-license-
scanning
-report.json
View file @
ecc55918
File moved
qa/qa/specs/features/ee/browser_ui/secure/license_compliance_spec.rb
View file @
ecc55918
...
...
@@ -38,7 +38,7 @@ module QA
end
end
describe
'License Compliance pipeline reports'
,
quarantine:
{
issue:
'https://gitlab.com/gitlab-org/gitlab/-/issues/217070'
,
type: :investigating
}
do
describe
'License Compliance pipeline reports'
do
let
(
:number_of_licenses_in_fixture
)
{
2
}
after
do
...
...
qa/qa/specs/features/ee/browser_ui/secure/merge_request_license_widget_spec.rb
View file @
ecc55918
...
...
@@ -3,7 +3,7 @@
require
'pathname'
module
QA
context
'Secure'
,
:docker
,
:runner
,
quarantine:
{
issue:
'https://gitlab.com/gitlab-org/gitlab/-/issues/217093'
,
type: :investigating
}
do
context
'Secure'
,
:docker
,
:runner
do
describe
'License merge request widget'
do
let
(
:approved_license_name
)
{
"MIT"
}
let
(
:blacklisted_license_name
)
{
"Zlib"
}
...
...
@@ -44,7 +44,7 @@ module QA
mr
.
source_branch
=
'license-management-mr'
mr
.
target_branch
=
'master'
mr
.
target
=
'master'
mr
.
file_name
=
'gl-license-
management
-report.json'
mr
.
file_name
=
'gl-license-
scanning
-report.json'
mr
.
file_content
=
<<~
FILE_UPDATE
{
...
...
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