Commit ddf881b2 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Merge branch 'dast-auto-deploy' into 'master'

DAST-Default-Branch-Deploy.gitlab-ci.yml should not clobber Deploy template

See merge request gitlab-org/gitlab!19859
parents 39a85ac2 70add326
.auto-deploy: .dast-auto-deploy:
image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v0.4.0" image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v0.4.0"
dast_environment_deploy: dast_environment_deploy:
extends: .auto-deploy extends: .dast-auto-deploy
stage: review stage: review
script: script:
- auto-deploy check_kube_domain - auto-deploy check_kube_domain
...@@ -31,7 +31,7 @@ dast_environment_deploy: ...@@ -31,7 +31,7 @@ dast_environment_deploy:
- $DAST_WEBSITE # we don't need to create a review app if a URL is already given - $DAST_WEBSITE # we don't need to create a review app if a URL is already given
stop_dast_environment: stop_dast_environment:
extends: .auto-deploy extends: .dast-auto-deploy
stage: cleanup stage: cleanup
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
......
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