Commit fa5fd6d3 authored by Dan Davison's avatar Dan Davison

Merge branch 'qa-update-specs-with-license-scanning' into 'master'

Update specs to use license scanning

Closes #217070 and #217093

See merge request gitlab-org/gitlab!31507
parents 1f35f62e ecc55918
include: include:
template: License-Management.gitlab-ci.yml template: License-Scanning.gitlab-ci.yml
license_management: license_scanning:
tags: tags:
- qa - qa
- test - test
...@@ -9,4 +9,4 @@ license_management: ...@@ -9,4 +9,4 @@ license_management:
- echo "Skipped" - echo "Skipped"
artifacts: artifacts:
reports: reports:
license_management: gl-license-management-report.json license_scanning: gl-license-scanning-report.json
...@@ -3,7 +3,7 @@ include: ...@@ -3,7 +3,7 @@ include:
template: Container-Scanning.gitlab-ci.yml template: Container-Scanning.gitlab-ci.yml
template: SAST.gitlab-ci.yml template: SAST.gitlab-ci.yml
template: DAST.gitlab-ci.yml template: DAST.gitlab-ci.yml
template: License-Management.gitlab-ci.yml template: License-Scanning.gitlab-ci.yml
dependency_scanning: dependency_scanning:
tags: tags:
...@@ -50,7 +50,7 @@ dast: ...@@ -50,7 +50,7 @@ dast:
reports: reports:
dast: gl-dast-report.json dast: gl-dast-report.json
license_management: license_scanning:
tags: tags:
- qa - qa
- test - test
...@@ -58,4 +58,4 @@ license_management: ...@@ -58,4 +58,4 @@ license_management:
- echo "Skipped" - echo "Skipped"
artifacts: artifacts:
reports: reports:
license_management: gl-license-management-report.json license_scanning: gl-license-scanning-report.json
...@@ -38,7 +38,7 @@ module QA ...@@ -38,7 +38,7 @@ module QA
end end
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 } let(:number_of_licenses_in_fixture) { 2 }
after do after do
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
require 'pathname' require 'pathname'
module QA 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 describe 'License merge request widget' do
let(:approved_license_name) { "MIT" } let(:approved_license_name) { "MIT" }
let(:blacklisted_license_name) { "Zlib" } let(:blacklisted_license_name) { "Zlib" }
...@@ -44,7 +44,7 @@ module QA ...@@ -44,7 +44,7 @@ module QA
mr.source_branch = 'license-management-mr' mr.source_branch = 'license-management-mr'
mr.target_branch = 'master' mr.target_branch = 'master'
mr.target = 'master' mr.target = 'master'
mr.file_name = 'gl-license-management-report.json' mr.file_name = 'gl-license-scanning-report.json'
mr.file_content = mr.file_content =
<<~FILE_UPDATE <<~FILE_UPDATE
{ {
......
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