Commit c911a72d authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '37278-SAST_DISABLE_DIND-true' into 'master'

Make SAST_DISABLE_DIND true

See merge request gitlab-org/gitlab!31589
parents 19a8a50e 0f577f55
---
title: 'Disable Docker-in-Docker for SAST by default'
merge_request: 31589
author:
type: changed
...@@ -33,7 +33,11 @@ describe 'SAST.gitlab-ci.yml' do ...@@ -33,7 +33,11 @@ describe 'SAST.gitlab-ci.yml' do
allow(License).to receive(:current).and_return(license) allow(License).to receive(:current).and_return(license)
end end
context 'by default' do context 'when SAST_DISABLE_DIND=false' do
before do
create(:ci_variable, project: project, key: 'SAST_DISABLE_DIND', value: 'false')
end
it 'includes orchestrator job' do it 'includes orchestrator job' do
expect(build_names).to match_array(%w[sast]) expect(build_names).to match_array(%w[sast])
end end
...@@ -49,11 +53,7 @@ describe 'SAST.gitlab-ci.yml' do ...@@ -49,11 +53,7 @@ describe 'SAST.gitlab-ci.yml' do
end end
end end
context 'when SAST_DISABLE_DIND=true' do context 'by default' do
before do
create(:ci_variable, project: project, key: 'SAST_DISABLE_DIND', value: 'true')
end
describe 'language detection' do describe 'language detection' do
using RSpec::Parameterized::TableSyntax using RSpec::Parameterized::TableSyntax
......
...@@ -14,7 +14,7 @@ variables: ...@@ -14,7 +14,7 @@ variables:
SAST_DEFAULT_ANALYZERS: "bandit, brakeman, gosec, spotbugs, flawfinder, phpcs-security-audit, security-code-scan, nodejs-scan, eslint, tslint, secrets, sobelow, pmd-apex, kubesec" SAST_DEFAULT_ANALYZERS: "bandit, brakeman, gosec, spotbugs, flawfinder, phpcs-security-audit, security-code-scan, nodejs-scan, eslint, tslint, secrets, sobelow, pmd-apex, kubesec"
SAST_ANALYZER_IMAGE_TAG: 2 SAST_ANALYZER_IMAGE_TAG: 2
SAST_DISABLE_DIND: "false" SAST_DISABLE_DIND: "true"
SCAN_KUBERNETES_MANIFESTS: "false" SCAN_KUBERNETES_MANIFESTS: "false"
sast: sast:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment