Commit 377c9ef0 authored by Mark Pundsack's avatar Mark Pundsack

Merge branch 'move-optional-tests' into 'master'

Move optional tests to overlap with deploy

See merge request !14860
parents b2114d5a 3e95f8fd
Pipeline #32703919 failed with stages
in 13 minutes and 36 seconds
......@@ -19,7 +19,6 @@ cache:
stages:
- prepare
- build
- test
- deploy
- dast
......@@ -139,7 +138,7 @@ build_master:
- master
codequality:
stage: test
stage: deploy
image: docker:stable
allow_failure: true
before_script: []
......@@ -162,7 +161,7 @@ codequality:
- codeclimate.json
dependency_scanning:
stage: test
stage: deploy
image: docker:stable
allow_failure: true
before_script: []
......@@ -184,31 +183,6 @@ dependency_scanning:
paths:
- gl-dependency-scanning-report.json
dast:
stage: dast
only:
- branches@gitlab-com/www-gitlab-com
except:
- master@gitlab-com/www-gitlab-com
image: registry.gitlab.com/gitlab-org/security-products/zaproxy
allow_failure: true
before_script: []
cache: {}
dependencies: []
tags: []
services: []
variables:
DOCKER_DRIVER: overlay2
DAST_WEB_SITE: http://$CI_COMMIT_REF_SLUG.about.gitlab.com
script:
- if [ -z $DAST_WEB_SITE ]; then echo "Please configure DAST_WEB_SITE env variable" && exit 1; fi
- mkdir /zap/wrk/
- /zap/zap-baseline.py -J gl-dast-report.json -t $DAST_WEB_SITE || true
- cp /zap/wrk/gl-dast-report.json .
artifacts:
paths:
- gl-dast-report.json
review:
stage: deploy
allow_failure: true
......@@ -271,3 +245,28 @@ deploy:
- deploy
only:
- master@gitlab-com/www-gitlab-com
dast:
stage: dast
only:
- branches@gitlab-com/www-gitlab-com
except:
- master@gitlab-com/www-gitlab-com
image: registry.gitlab.com/gitlab-org/security-products/zaproxy
allow_failure: true
before_script: []
cache: {}
dependencies: []
tags: []
services: []
variables:
DOCKER_DRIVER: overlay2
DAST_WEB_SITE: http://$CI_COMMIT_REF_SLUG.about.gitlab.com
script:
- if [ -z $DAST_WEB_SITE ]; then echo "Please configure DAST_WEB_SITE env variable" && exit 1; fi
- mkdir /zap/wrk/
- /zap/zap-baseline.py -J gl-dast-report.json -t $DAST_WEB_SITE || true
- cp /zap/wrk/gl-dast-report.json .
artifacts:
paths:
- gl-dast-report.json
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