diff --git a/qa/qa/ee/fixtures/secure_cvs_files/.gitlab-ci.yml b/qa/qa/ee/fixtures/secure_cvs_files/.gitlab-ci.yml index 08b37204bab76376e98ab4b2639f620bd1e6939d..54508262dbe47178e5b45e054e8b01175a9564cc 100644 --- a/qa/qa/ee/fixtures/secure_cvs_files/.gitlab-ci.yml +++ b/qa/qa/ee/fixtures/secure_cvs_files/.gitlab-ci.yml @@ -1,13 +1,2 @@ include: - template: Security/Dependency-Scanning.gitlab-ci.yml - -gemnasium-dependency_scanning: - rules: - - when: always - artifacts: - paths: - - gl-sbom.json - - gl-dependency-scanning-report.json - reports: - cyclonedx: gl-sbom.json - dependency_scanning: gl-dependency-scanning-report.json diff --git a/qa/qa/ee/fixtures/secure_cvs_files/gl-sbom.json b/qa/qa/ee/fixtures/secure_cvs_files/gl-sbom.json deleted file mode 100644 index a5993fa405cd843fedf78fbaca4581154f41f139..0000000000000000000000000000000000000000 --- a/qa/qa/ee/fixtures/secure_cvs_files/gl-sbom.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "bomFormat": "CycloneDX", - "specVersion": "1.4", - "serialNumber": "urn:uuid:b9b7822a-19fb-4087-b690-88273bb93f76", - "version": 1, - "metadata": { - "timestamp": "2024-04-23T06:54:54Z", - "tools": [ - { - "vendor": "GitLab", - "name": "Gemnasium", - "version": "5.0.0-rc3" - } - ], - "authors": [ - { - "name": "GitLab", - "email": "support@gitlab.com" - } - ], - "properties": [ - { - "name": "gitlab:dependency_scanning:input_file:path", - "value": "Gemfile.lock" - }, - { - "name": "gitlab:dependency_scanning:package_manager:name", - "value": "bundler" - }, - { - "name": "gitlab:meta:schema_version", - "value": "1" - } - ] - }, - "components": [ - { - "name": "RedCloth", - "version": "2.0.0", - "purl": "pkg:gem/RedCloth@2.0.0", - "type": "library", - "bom-ref": "pkg:gem/RedCloth@2.0.0" - } - ] -} diff --git a/qa/qa/specs/features/ee/browser_ui/13_secure/cvs_dependency_scanning_spec.rb b/qa/qa/specs/features/ee/browser_ui/13_secure/cvs_dependency_scanning_spec.rb index 1fccc7375d7996a3aaf0396a550463ba21e36378..2cd15b685c3e98fa56832f552df2e953674b9d1b 100644 --- a/qa/qa/specs/features/ee/browser_ui/13_secure/cvs_dependency_scanning_spec.rb +++ b/qa/qa/specs/features/ee/browser_ui/13_secure/cvs_dependency_scanning_spec.rb @@ -76,17 +76,6 @@ def create_file_actions 'Gemf.lock' ) ) - }, - { - action: 'create', - file_path: 'gl-sbom.json', - content: File.read( - File.join( - EE::Runtime::Path.fixtures_path, - 'secure_cvs_files', - 'gl-sbom.json' - ) - ) } ] end @@ -111,8 +100,6 @@ def verify_vulnerabilities vulnerability_list.has_vulnerability?(description: 'Arbitrary test vulnerability') end - expect(vulnerability_list).not_to have_vulnerability(description: 'Outdated test vulnerability') - vulnerability_list.click_vulnerability(description: 'Arbitrary test vulnerability') end