Skip to content

Commit b1b22a5

Browse files
authored
Use default credscan tool (#42431)
1 parent f379729 commit b1b22a5

File tree

4 files changed

+18
-1107
lines changed

4 files changed

+18
-1107
lines changed

eng/pipelines/aggregate-reports.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,13 @@ stages:
9999
displayName: Compliance Tools
100100
dependsOn: []
101101

102+
variables:
103+
Codeql.SkipTaskAutoInjection: false
104+
102105
jobs:
103106
- job: ComplianceTools
104107
timeoutInMinutes: 120
105108
steps:
106-
- template: /eng/common/pipelines/templates/steps/credscan.yml
107-
parameters:
108-
BaselineFilePath: $(Build.SourcesDirectory)\eng\python.gdnbaselines
109-
110109
- template: /eng/common/pipelines/templates/steps/policheck.yml
111110
parameters:
112111
PublishAnalysisLogs: false

eng/pipelines/templates/jobs/ci.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,17 @@ jobs:
7171
image: $(LINUXVMIMAGE)
7272
os: linux
7373

74+
# Only run CG and codeql on internal build job
75+
${{ if eq(variables['System.TeamProject'], 'internal') }}:
76+
templateContext:
77+
sdl:
78+
componentgovernance:
79+
enabled: true
80+
codeql:
81+
binaryLanguages: python # Need to specify the language because we clone after the codeql initialize step
82+
compiled:
83+
enabled: true
84+
7485
steps:
7586
- template: /eng/pipelines/templates/steps/build-package-artifacts.yml
7687
parameters:

eng/pipelines/templates/stages/1es-redirect.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,12 @@ extends:
5353
codeql:
5454
compiled:
5555
enabled: false
56-
justificationForDisabling: "CodeQL times our pipelines out by running for 2+ hours before being force canceled."
56+
justificationForDisabling: "To reduce redundant CG runs across all our pipeline jobs we are disabling and only running in our main build job."
57+
componentgovernance:
58+
enabled: false
59+
justificationForDisabling: "To reduce redundant CG runs across all our pipeline jobs we are disabling and only running in our main build job."
5760
credscan:
5861
suppressionsFile: '$(Build.SourcesDirectory)/eng/CredScanSuppression.json'
59-
toolVersion: '2.3.12.23'
60-
baselineFiles: $(Build.SourcesDirectory)/eng/python.gdnbaselines
6162
psscriptanalyzer:
6263
compiled: true
6364
break: true

0 commit comments

Comments
 (0)