Merge branch 'craigmsmith-remove-unused-if-conditions-374992' into 'master'

Remove redundant if conditions in DAST YAML

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/105616



Merged-by: Marcel Amirault <mamirault@gitlab.com>
Approved-by: Philip Cunningham <pcunningham@gitlab.com>
Approved-by: Marcel Amirault <mamirault@gitlab.com>
Co-authored-by: Craig Smith <5344211-craigmsmith@users.noreply.gitlab.com>

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

@@ -50,8 +50,5 @@ dast:
     - if: $CI_DEFAULT_BRANCH != $CI_COMMIT_REF_NAME &&
           $REVIEW_DISABLED
       when: never
-    - if: $CI_COMMIT_BRANCH &&
-          ($CI_KUBERNETES_ACTIVE || $KUBECONFIG) &&
-          $GITLAB_FEATURES =~ /\bdast\b/
     - if: $CI_COMMIT_BRANCH &&
           $GITLAB_FEATURES =~ /\bdast\b/

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

@@ -54,9 +54,6 @@ dast:
       when: never
 
     # Add the job to merge request pipelines if there's an open merge request.
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" &&
-          ($CI_KUBERNETES_ACTIVE || $KUBECONFIG) &&
-          $GITLAB_FEATURES =~ /\bdast\b/
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" &&
           $GITLAB_FEATURES =~ /\bdast\b/
 
@@ -65,9 +62,6 @@ dast:
       when: never
 
     # Add the job to branch pipelines.
-    - if: $CI_COMMIT_BRANCH &&
-          ($CI_KUBERNETES_ACTIVE || $KUBECONFIG) &&
-          $GITLAB_FEATURES =~ /\bdast\b/
     - if: $CI_COMMIT_BRANCH &&
           $GITLAB_FEATURES =~ /\bdast\b/
   after_script: