Skip to content

Commit 61013db

Browse files
authored
Clean-up some of the SDL tool configurations (Azure#51560)
1 parent 5b0790a commit 61013db

File tree

5 files changed

+17
-18
lines changed

5 files changed

+17
-18
lines changed

eng/pipelines/aggregate-reports.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,6 @@ stages:
145145
jobs:
146146
- job: ComplianceTools
147147
timeoutInMinutes: 120
148-
variables:
149-
- template: /eng/pipelines/templates/variables/codeql.yml
150148

151149
steps:
152150
- template: /eng/common/pipelines/templates/steps/policheck.yml

eng/pipelines/templates/jobs/batched-build-analyze.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ jobs:
4343
matrix: $[ ${{ parameters.Matrix }} ]
4444

4545
variables:
46-
- template: /eng/pipelines/templates/variables/codeql.yml
47-
- name: Codeql.BuildIdentifier
48-
value: ${{ parameters.ServiceDirectory }}
4946
- name: SDKType
5047
value: ${{ parameters.SDKType }}
5148

eng/pipelines/templates/jobs/ci.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,19 @@ jobs:
9494
os: windows
9595

9696
variables:
97-
- template: /eng/pipelines/templates/variables/codeql.yml
98-
- name: Codeql.BuildIdentifier
99-
value: ${{ parameters.ServiceDirectory }}
10097
- name: SDKType
10198
value: ${{ parameters.SDKType }}
10299

100+
# Only run CG and codeql on internal build job
101+
${{ if eq(variables['System.TeamProject'], 'internal') }}:
102+
templateContext:
103+
sdl:
104+
componentgovernance:
105+
enabled: true
106+
codeql:
107+
compiled:
108+
enabled: false
109+
103110
steps:
104111
- template: /eng/pipelines/templates/steps/build.yml
105112
parameters:

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ extends:
4040
- 1ES.PT.Tag-refs/tags/canary
4141
settings:
4242
skipBuildTagsForGitHubPullRequests: true
43-
${{ if and(eq(variables['Build.DefinitionName'], 'net - core'), eq(variables['Build.SourceBranchName'], 'main'), eq(variables['System.TeamProject'], 'internal')) }}:
44-
featureFlags:
45-
autoBaseline: true
4643
sdl:
4744
${{ if and(eq(variables['Build.DefinitionName'], 'net - core'), eq(variables['Build.SourceBranchName'], 'main'), eq(variables['System.TeamProject'], 'internal')) }}:
4845
autobaseline:
@@ -62,13 +59,16 @@ extends:
6259
analyzeTargetGlob: +:file|**/*.dll;+:file|**/*.exe;-:f|**/net452/Microsoft.Azure.KeyVault.Core.dll;-:f|**/net461/Microsoft.Azure.KeyVault.Core.dll;-:f|**/tools/NuGet.exe;-:f|**/tools/gpg/**/*.dll;-:f|**/tools/gpg/**/*.exe;-:f|**/tools/azcopy/**/*.exe;-:f|**/tools/azcopy/**/*.dll;-:f|**/aotcompatibility/**/*.exe
6360
# Turn off the build warnings caused by disabling some sdl checks
6461
createAdoIssuesForJustificationsForDisablement: false
65-
eslint:
66-
enabled: false
67-
justificationForDisabling: 'ESLint injected task has failures because it uses an old version of mkdirp. We should not fail for tools not controlled by the repo. See: https://dev.azure.com/azure-sdk/internal/_build/results?buildId=3499746'
6862
codeql:
6963
compiled:
7064
enabled: false
71-
justificationForDisabling: CodeQL times our pipelines out by running for 2+ hours before being force canceled.
65+
justificationForDisabling: "To reduce redundant CG runs across all our pipeline jobs we are disabling and only running in our main build job."
66+
componentgovernance:
67+
enabled: false
68+
justificationForDisabling: "To reduce redundant CG runs across all our pipeline jobs we are disabling and only running in our main build job."
69+
eslint:
70+
enabled: false
71+
justificationForDisabling: 'ESLint is interesting for this repo as it is .NET code mostly and any JS/TS in the repo is updated outside of this repo.'
7272
psscriptanalyzer:
7373
compiled: true
7474
break: true

eng/pipelines/templates/variables/codeql.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)