Skip to content

Commit 98f26c6

Browse files
pwshBotjshigetomiTravisEz13
authored
[release/v7.4] Remove AsyncSDL from Pipelines Toggle Official/NonOfficial Runs (#25965)
Co-authored-by: Justin Chung <124807742+jshigetomi@users.noreply.github.com> Co-authored-by: Travis Plunk <travis.plunk@microsoft.com>
1 parent 744a53a commit 98f26c6

File tree

5 files changed

+61
-40
lines changed

5 files changed

+61
-40
lines changed

‎.pipelines/PowerShell-Coordinated_Packages-Official.yml‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ parameters:
2626
displayName: Enable MSBuild Binary Logs
2727
type: boolean
2828
default: false
29+
- name: OfficialBuild
30+
type: boolean
31+
default: false
32+
2933

3034
resources:
3135
repositories:
@@ -74,15 +78,24 @@ variables:
7478
- group: mscodehub-feed-read-akv
7579
- name: ENABLE_MSBUILD_BINLOGS
7680
value: ${{ parameters.ENABLE_MSBUILD_BINLOGS }}
81+
- name: templateFile
82+
value: ${{ iif ( parameters.OfficialBuild, 'v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates', 'v2/OneBranch.NonOfficial.CrossPlat.yml@onebranchTemplates' ) }}
83+
# Fix for BinSkim ICU package error in Linux containers
84+
- name: DOTNET_SYSTEM_GLOBALIZATION_INVARIANT
85+
value: true
86+
# Disable BinSkim at job level to override NonOfficial template defaults
87+
- name: ob_sdl_binskim_enabled
88+
value: false
7789

7890
extends:
79-
template: v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates
91+
template: ${{ variables.templateFile }}
8092
parameters:
8193
featureFlags:
8294
LinuxHostVersion:
8395
Network: KS3
8496
WindowsHostVersion:
8597
Network: KS3
98+
incrementalSDLBinaryAnalysis: true
8699
globalSdl:
87100
disableLegacyManifest: true
88101
# disabled Armorty as we dont have any ARM templates to scan. It fails on some sample ARM templates.
@@ -102,19 +115,13 @@ extends:
102115
cg:
103116
enabled: true
104117
ignoreDirectories: '.devcontainer,demos,docker,docs,src,test,tools/packaging'
105-
asyncSdl:
106-
enabled: true
107-
forStages: [prep, macos, linux, windows, SignFiles, test_and_release_artifacts]
108-
credscan:
109-
enabled: true
110-
scanFolder: $(Build.SourcesDirectory)
111-
suppressionsFile: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
112-
binskim:
113-
enabled: false
114-
# APIScan requires a non-Ready-To-Run build
115-
apiscan:
116-
enabled: false
117-
tsaOptionsFile: .config\tsaoptions.json
118+
binskim:
119+
enabled: false
120+
exactToolVersion: 4.4.2
121+
# APIScan requires a non-Ready-To-Run build
122+
apiscan:
123+
enabled: false
124+
tsaOptionsFile: .config\tsaoptions.json
118125

119126
stages:
120127
- stage: prep

‎.pipelines/PowerShell-Packages-Official.yml‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ parameters: # parameters are shown up in ADO UI in a build queue time
2424
displayName: Skip Signing
2525
type: string
2626
default: 'NO'
27-
27+
- name: OfficialBuild
28+
type: boolean
29+
default: false
30+
2831
name: pkgs-$(BUILD.SOURCEBRANCHNAME)-$(Build.BuildId)
2932

3033
variables:
@@ -61,6 +64,9 @@ variables:
6164
- name: branchCounter
6265
value: $[counter(variables['branchCounterKey'], 1)]
6366
- group: MSIXSigningProfile
67+
- name: templateFile
68+
value: ${{ iif ( parameters.OfficialBuild, 'v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates', 'v2/OneBranch.NonOfficial.CrossPlat.yml@onebranchTemplates' ) }}
69+
6470

6571
resources:
6672
pipelines:
@@ -79,7 +85,7 @@ resources:
7985
ref: refs/heads/main
8086

8187
extends:
82-
template: v2/OneBranch.Official.CrossPlat.yml@templates
88+
template: ${{ variables.templateFile }}
8389
parameters:
8490
cloudvault:
8591
enabled: false
@@ -88,6 +94,7 @@ extends:
8894
Version: 2022
8995
Network: KS3
9096
linuxEsrpSigning: true
97+
incrementalSDLBinaryAnalysis: true
9198
globalSdl:
9299
disableLegacyManifest: true
93100
# disabled Armorty as we dont have any ARM templates to scan. It fails on some sample ARM templates.
@@ -104,19 +111,13 @@ extends:
104111
cg:
105112
enabled: true
106113
ignoreDirectories: '.devcontainer,demos,docker,docs,src,test,tools/packaging'
107-
asyncSdl:
108-
enabled: true
109-
forStages: ['build']
110-
credscan:
111-
enabled: true
112-
scanFolder: $(Build.SourcesDirectory)
113-
suppressionsFile: $(Build.SourcesDirectory)\PowerShell\.config\suppress.json
114-
binskim:
115-
enabled: false
116-
# APIScan requires a non-Ready-To-Run build
117-
apiscan:
118-
enabled: false
119-
tsaOptionsFile: .config\tsaoptions.json
114+
binskim:
115+
enabled: false
116+
exactToolVersion: 4.4.2
117+
# APIScan requires a non-Ready-To-Run build
118+
apiscan:
119+
enabled: false
120+
tsaOptionsFile: .config\tsaoptions.json
120121
stages:
121122
- stage: prep
122123
jobs:

‎.pipelines/PowerShell-Release-Official-Azure.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ parameters: # parameters are shown up in ADO UI in a build queue time
1313
displayName: Skip Signing
1414
type: string
1515
default: 'NO'
16+
- name: OfficialBuild
17+
type: boolean
18+
default: false
1619

1720
name: ev2-$(BUILD.SOURCEBRANCHNAME)-$(Build.BuildId)
1821

@@ -46,6 +49,9 @@ variables:
4649
- name: LinuxContainerImage
4750
value: mcr.microsoft.com/onebranch/cbl-mariner/build:2.0
4851
- group: PoolNames
52+
- name: templateFile
53+
value: ${{ iif ( parameters.OfficialBuild, 'v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates', 'v2/OneBranch.NonOfficial.CrossPlat.yml@onebranchTemplates' ) }}
54+
4955

5056
resources:
5157
repositories:
@@ -67,23 +73,21 @@ resources:
6773
- releases/*
6874

6975
extends:
70-
template: v2/OneBranch.Official.CrossPlat.yml@templates
76+
template: ${{ variables.templateFile }}
7177
parameters:
7278
featureFlags:
7379
WindowsHostVersion:
7480
Version: 2022
7581
Network: Netlock
7682
linuxEsrpSigning: true
83+
incrementalSDLBinaryAnalysis: true
7784
cloudvault:
7885
enabled: false
7986
globalSdl:
8087
disableLegacyManifest: true
8188
# disabled Armory as we dont have any ARM templates to scan. It fails on some sample ARM templates.
8289
armory:
8390
enabled: false
84-
asyncSdl:
85-
enabled: true
86-
tsaOptionsFile: .config/tsaoptions.json
8791
tsa:
8892
enabled: true
8993
credscan:
@@ -92,6 +96,7 @@ extends:
9296
suppressionsFile: $(Build.SourcesDirectory)\.config\suppress.json
9397
binskim:
9498
break: false # always break the build on binskim issues in addition to TSA upload
99+
exactToolVersion: 4.4.2
95100
policheck:
96101
break: true # always break the build on policheck issues. You can disable it by setting to 'false'
97102
tsaOptionsFile: .config\tsaoptions.json

‎.pipelines/PowerShell-Release-Official.yml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ parameters: # parameters are shown up in ADO UI in a build queue time
2525
displayName: Skip Copying Archives and Installers to PSInfrastructure Public Location
2626
type: boolean
2727
default: false
28+
- name: OfficialBuild
29+
type: boolean
30+
default: false
2831

2932
name: release-$(BUILD.SOURCEBRANCHNAME)-$(Build.BuildId)
3033

@@ -58,6 +61,13 @@ variables:
5861
- name: ReleaseTagVar
5962
value: ${{ parameters.ReleaseTagVar }}
6063
- group: PoolNames
64+
- name: templateFile
65+
value: ${{ iif ( parameters.OfficialBuild, 'v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates', 'v2/OneBranch.NonOfficial.CrossPlat.yml@onebranchTemplates' ) }}
66+
- name: releaseEnvironment
67+
value: ${{ iif ( parameters.OfficialBuild, 'Production', 'Test' ) }}
68+
# Fix for BinSkim ICU package error in Linux containers
69+
- name: DOTNET_SYSTEM_GLOBALIZATION_INVARIANT
70+
value: true
6171

6272
resources:
6373
repositories:
@@ -83,24 +93,22 @@ resources:
8393
- releases/*
8494

8595
extends:
86-
template: v2/OneBranch.Official.CrossPlat.yml@templates
96+
template: ${{ variables.templateFile }}
8797
parameters:
8898
release:
8999
category: NonAzure
90100
featureFlags:
91101
WindowsHostVersion:
92102
Version: 2022
93103
Network: KS3
104+
incrementalSDLBinaryAnalysis: true
94105
cloudvault:
95106
enabled: false
96107
globalSdl:
97108
disableLegacyManifest: true
98109
# disabled Armory as we dont have any ARM templates to scan. It fails on some sample ARM templates.
99110
armory:
100111
enabled: false
101-
asyncSdl:
102-
enabled: true
103-
tsaOptionsFile: .config/tsaoptions.json
104112
tsa:
105113
enabled: true
106114
credscan:
@@ -109,6 +117,7 @@ extends:
109117
suppressionsFile: $(Build.SourcesDirectory)\.config\suppress.json
110118
binskim:
111119
break: false # always break the build on binskim issues in addition to TSA upload
120+
exactToolVersion: 4.4.2
112121
policheck:
113122
break: true # always break the build on policheck issues. You can disable it by setting to 'false'
114123
# suppression:
@@ -279,7 +288,7 @@ extends:
279288
- setReleaseTagAndChangelog
280289
- UpdateChangeLog
281290
variables:
282-
ob_release_environment: Production
291+
ob_release_environment: ${{ parameters.releaseEnvironment }}
283292
jobs:
284293
- template: /.pipelines/templates/release-githubNuget.yml@self
285294
parameters:

‎.pipelines/PowerShell-vPack-Official.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,10 @@ extends:
9393
suppressionsFile: $(Build.SourcesDirectory)\.config\suppress.json
9494
binskim:
9595
enabled: false
96+
exactToolVersion: 4.4.2
9697
# APIScan requires a non-Ready-To-Run build
9798
apiscan:
9899
enabled: false
99-
asyncSDL:
100-
enabled: false
101100
tsaOptionsFile: .config/tsaoptions.json
102101
stages:
103102
- stage: main

0 commit comments

Comments
 (0)