From cfb0bab2644876431cd8b855307c6ba33a4cdcd2 Mon Sep 17 00:00:00 2001
From: Dmytro Bogatov <dmytro@dbogatov.org>
Date: Sat, 1 Dec 2018 16:41:00 -0500
Subject: [PATCH] Add license check.
---
.gitlab-ci.yml | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b5ba40..4415d2b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,28 +22,26 @@ include:
- 'https://git.dbogatov.org/templates/ci-snippets/raw/master/simple-website/review/review.yml'
- 'https://git.dbogatov.org/templates/ci-snippets/raw/master/simple-website/review/stop-review.yml'
-# - 'https://git.dbogatov.org/templates/ci-snippets/raw/master/code-quality.yml'
-# - 'https://git.dbogatov.org/templates/ci-snippets/raw/master/sast.yml'
-# - 'https://git.dbogatov.org/templates/ci-snippets/raw/master/deps-scan.yml'
-# - 'https://git.dbogatov.org/templates/ci-snippets/raw/master/container-scan.yml'
+# - 'https://git.dbogatov.org/templates/ci-snippets/raw/master/quality-security/code-quality.yml'
+# - 'https://git.dbogatov.org/templates/ci-snippets/raw/master/quality-security/sast.yml'
+# - 'https://git.dbogatov.org/templates/ci-snippets/raw/master/quality-security/deps-scan.yml'
+# - 'https://git.dbogatov.org/templates/ci-snippets/raw/master/quality-security/container-scan.yml'
+# - 'https://git.dbogatov.org/templates/ci-snippets/raw/master/quality-security/dast.yml'
- 'https://git.dbogatov.org/templates/ci-snippets/raw/master/simple-website/dockerify.yml'
- 'https://git.dbogatov.org/templates/ci-snippets/raw/master/simple-website/pages.yml'
-dast:
+license-check:
stage: quality-security
- image: registry.gitlab.com/gitlab-org/security-products/zaproxy
- variables:
- website: "https://review:$AUTHPASSWORD@$CI_BUILD_REF_NAME-$CI_PROJECT_NAME.review.dbogatov.org"
+ image:
+ name: "registry.gitlab.com/gitlab-org/security-products/license-management:$CI_SERVER_VERSION_MAJOR-$CI_SERVER_VERSION_MINOR-stable"
+ entrypoint: [""]
+ stage: test
allow_failure: true
script:
- - mkdir /zap/wrk/
- - /zap/zap-baseline.py -J gl-dast-report.json -t $website || true
- - cp /zap/wrk/gl-dast-report.json .
+ - /run.sh analyze .
artifacts:
reports:
- dast: gl-dast-report.json
- when: delayed
- start_in: 1 minutes
+ license_management: gl-license-management-report.json
tags:
- - docker
+ - docker
--
GitLab