Merge branch 'revert-7b867e5e' into 'master'

Revert "Merge branch 'craigmsmith_make_dast_reusable_340420' into 'master'"

See merge request gitlab-org/gitlab!71000

lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml

@@ -27,23 +27,20 @@ variables:
   # (SAST, Dependency Scanning, ...)
   SECURE_ANALYZERS_PREFIX: "registry.gitlab.com/gitlab-org/security-products/analyzers"
 
-.dast_base:
+dast:
   stage: dast
   image:
     name: "$SECURE_ANALYZERS_PREFIX/dast:$DAST_VERSION"
   variables:
     GIT_STRATEGY: none
+  allow_failure: true
   script:
     - export DAST_WEBSITE=${DAST_WEBSITE:-$(cat environment_url.txt)}
     - if [ -z "$DAST_WEBSITE$DAST_API_SPECIFICATION" ]; then echo "Either DAST_WEBSITE or DAST_API_SPECIFICATION must be set. See https://docs.gitlab.com/ee/user/application_security/dast/#configuration for more details." && exit 1; fi
     - /analyze
-  allow_failure: true
   artifacts:
     reports:
       dast: gl-dast-report.json
-
-dast:
-  extends: .dast_base
   rules:
     - if: $DAST_DISABLED
       when: never

lib/gitlab/ci/templates/Security/DAST.latest.gitlab-ci.yml

@@ -27,23 +27,20 @@ variables:
   # (SAST, Dependency Scanning, ...)
   SECURE_ANALYZERS_PREFIX: "registry.gitlab.com/gitlab-org/security-products/analyzers"
 
-.dast_base:
+dast:
   stage: dast
   image:
     name: "$SECURE_ANALYZERS_PREFIX/dast:$DAST_VERSION"
   variables:
     GIT_STRATEGY: none
+  allow_failure: true
   script:
     - export DAST_WEBSITE=${DAST_WEBSITE:-$(cat environment_url.txt)}
     - if [ -z "$DAST_WEBSITE$DAST_API_SPECIFICATION" ]; then echo "Either DAST_WEBSITE or DAST_API_SPECIFICATION must be set. See https://docs.gitlab.com/ee/user/application_security/dast/#configuration for more details." && exit 1; fi
     - /analyze
-  allow_failure: true
   artifacts:
     reports:
       dast: gl-dast-report.json
-
-dast:
-  extends: .dast_base
   rules:
     - if: $DAST_DISABLED
       when: never