Check SAST_DISABLE when SAST_DISABLE_DIND is set

a5c4ea30 · Philippe Lafoucrière · Jan Provaznik · a5569d77 · a5c4ea30 · a5c4ea30
Commit a5c4ea30 authored Jan 07, 2020 by Philippe Lafoucrière Committed by Jan Provaznik Jan 07, 2020
Showing with 6 additions and 0 deletions

changelogs/unreleased/22166-fix-sast-template.yml changelogs/unreleased/22166-fix-sast-template.yml +5 -0

lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml +1 -0

No files found.
--- a/changelogs/unreleased/22166-fix-sast-template.yml
+++ b/changelogs/unreleased/22166-fix-sast-template.yml
+---
+title: Check both SAST_DISABLE and SAST_DISABLE_DIND when executing SAST job template
+merge_request: 22166
+author:
+type: fixed
--- a/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Security/SAST.gitlab-ci.yml
@@ -55,6 +55,7 @@ sast:
  services: []
  except:
    variables:
+      - $SAST_DISABLED
      - $SAST_DISABLE_DIND == 'false'
  script:
    - /analyzer run