Do not ignore DEPENDENCY_SCANNING_DISABLED if DS_DISABLE_DIND is set

c94e20d6 · Philippe Lafoucrière · Sean McGivern · 9293becb · c94e20d6 · c94e20d6
Commit c94e20d6 authored Jan 08, 2020 by Philippe Lafoucrière Committed by Sean McGivern Jan 08, 2020
2 changed files
--- a/changelogs/unreleased/22171-fix-disabling-dependency-scanning.yml
+++ b/changelogs/unreleased/22171-fix-disabling-dependency-scanning.yml
+---
+title: Check both DEPENDENCY_SCANNING_DISABLED and DS_DISABLE_DIND when executing Dependency Scanning job template
+merge_request: 22172
+author:
+type: fixed
--- a/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Security/Dependency-Scanning.gitlab-ci.yml
@@ -77,6 +77,7 @@ dependency_scanning:
  services: []
  except:
    variables:
+      - $DEPENDENCY_SCANNING_DISABLED
      - $DS_DISABLE_DIND == 'false'
  script:
    - /analyzer run