diff options
| author | Olivier Gonzalez <ogonzalez@gitlab.com> | 2019-04-05 11:36:02 -0400 |
|---|---|---|
| committer | Olivier Gonzalez <ogonzalez@gitlab.com> | 2019-04-05 11:36:19 -0400 |
| commit | d9a87919f88272fcaec51c2969c37077b57c2dda (patch) | |
| tree | 754b90c14ec265382da4e52d3cc229162d832c98 | |
| parent | 7a6109b17f413915fff5f58f6982cb918d6e2d84 (diff) | |
| download | gitlab-ce-59997-restore-original-security-dast-gitlab-ci-yml-template.tar.gz | |
Restore original DAST template and override in ADO59997-restore-original-security-dast-gitlab-ci-yml-template
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index a220301f5bc..b3eec2b6210 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -83,3 +83,9 @@ include: - template: Security/Dependency-Scanning.gitlab-ci.yml - template: Security/License-Management.gitlab-ci.yml - template: Security/SAST.gitlab-ci.yml + +# Override DAST job to exclude master branch +dast: + except: + refs: + - master
\ No newline at end of file diff --git a/lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml index 77d45fe3062..2a90cc9a06c 100644 --- a/lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml @@ -59,7 +59,5 @@ dast: variables: - $GITLAB_FEATURES =~ /\bdast\b/ except: - refs: - - master variables: - $DAST_DISABLED |