From 4def69cc61bb5689ee1bf76c9b78829ca7e64533 Mon Sep 17 00:00:00 2001
From: Craig Smith <5344211-craigmsmith@users.noreply.gitlab.com>
Date: Fri, 2 Dec 2022 07:04:47 +0000
Subject: [PATCH] Remove redundant if conditions in DAST YAML
---
lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml | 3 ---
lib/gitlab/ci/templates/Security/DAST.latest.gitlab-ci.yml | 6 ------
2 files changed, 9 deletions(-)
diff --git a/lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml
index 40060e96dff28..c43296b586570 100644
--- a/lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml
+++ b/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/
diff --git a/lib/gitlab/ci/templates/Security/DAST.latest.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/DAST.latest.gitlab-ci.yml
index 50e9bb5431d7a..27bcc14bcf541 100644
--- a/lib/gitlab/ci/templates/Security/DAST.latest.gitlab-ci.yml
+++ 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:
--
GitLab