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:
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
......@@ -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
......@@ -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
......
......@@ -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
{
......
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