Skip to content

Commit 2a4949b

Browse files
jshigetomijshigetomi
authored
[release/v7.4] Hardcode Official templates (#26928) (#26962)
1 parent 7d39838 commit 2a4949b

File tree

5 files changed

+24
-36
lines changed

5 files changed

+24
-36
lines changed

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

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@ parameters:
2525
displayName: Enable MSBuild Binary Logs
2626
type: boolean
2727
default: false
28-
- name: OfficialBuild
28+
- name: FORCE_CODEQL
29+
displayName: Debugging - Enable CodeQL and set cadence to 1 hour
2930
type: boolean
3031
default: false
3132

32-
name: bins-$(BUILD.SOURCEBRANCHNAME)-prod.${{ parameters.OfficialBuild }}-$(Build.BuildId)
33+
name: bins-$(BUILD.SOURCEBRANCHNAME)-prod.true-$(Build.BuildId)
3334

3435
resources:
3536
repositories:
@@ -78,19 +79,26 @@ variables:
7879
- group: mscodehub-feed-read-akv
7980
- name: ENABLE_MSBUILD_BINLOGS
8081
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' ) }}
82+
- ${{ if eq(parameters['FORCE_CODEQL'],'true') }}:
83+
# Cadence is hours before CodeQL will allow a re-upload of the database
84+
- name: CodeQL.Cadence
85+
value: 1
86+
- name: CODEQL_ENABLED
87+
${{ if or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq(parameters['FORCE_CODEQL'],'true')) }}:
88+
value: true
89+
${{ else }}:
90+
value: false
8391
# Fix for BinSkim ICU package error in Linux containers
8492
- name: DOTNET_SYSTEM_GLOBALIZATION_INVARIANT
8593
value: true
8694
# Disable BinSkim at job level to override NonOfficial template defaults
8795
- name: ob_sdl_binskim_enabled
8896
value: false
8997
- name: ps_official_build
90-
value: ${{ parameters.OfficialBuild }}
98+
value: true
9199

92100
extends:
93-
template: ${{ variables.templateFile }}
101+
template: v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates
94102
parameters:
95103
featureFlags:
96104
LinuxHostVersion:

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,11 @@ parameters: # parameters are shown up in ADO UI in a build queue time
2424
displayName: Skip Signing
2525
type: string
2626
default: 'NO'
27-
- name: OfficialBuild
28-
type: boolean
29-
default: false
3027
- name: disableNetworkIsolation
3128
type: boolean
3229
default: false
3330

34-
name: pkgs-$(BUILD.SOURCEBRANCHNAME)-prod.${{ parameters.OfficialBuild }}-$(Build.BuildId)
31+
name: pkgs-$(BUILD.SOURCEBRANCHNAME)-prod.true-$(Build.BuildId)
3532

3633
variables:
3734
- name: CDP_DEFINITION_BUILD_COUNT
@@ -67,8 +64,6 @@ variables:
6764
- name: branchCounter
6865
value: $[counter(variables['branchCounterKey'], 1)]
6966
- group: MSIXSigningProfile
70-
- name: templateFile
71-
value: ${{ iif ( parameters.OfficialBuild, 'v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates', 'v2/OneBranch.NonOfficial.CrossPlat.yml@onebranchTemplates' ) }}
7267
- name: disableNetworkIsolation
7368
value: ${{ parameters.disableNetworkIsolation }}
7469

@@ -89,7 +84,7 @@ resources:
8984
ref: refs/heads/main
9085

9186
extends:
92-
template: ${{ variables.templateFile }}
87+
template: v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates
9388
parameters:
9489
cloudvault:
9590
enabled: false
@@ -294,7 +289,7 @@ extends:
294289
jobs:
295290
- template: /.pipelines/templates/package-create-msix.yml@self
296291
parameters:
297-
OfficialBuild: ${{ parameters.OfficialBuild }}
292+
OfficialBuild: true
298293

299294
- stage: upload
300295
displayName: 'Upload'

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@ 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
1916

20-
name: ev2-$(BUILD.SOURCEBRANCHNAME)-prod.${{ parameters.OfficialBuild }}-$(Build.BuildId)
17+
name: ev2-$(BUILD.SOURCEBRANCHNAME)-prod.true-$(Build.BuildId)
2118

2219
variables:
2320
- name: CDP_DEFINITION_BUILD_COUNT
@@ -49,8 +46,6 @@ variables:
4946
- name: LinuxContainerImage
5047
value: mcr.microsoft.com/onebranch/azurelinux/build:3.0
5148
- group: PoolNames
52-
- name: templateFile
53-
value: ${{ iif ( parameters.OfficialBuild, 'v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates', 'v2/OneBranch.NonOfficial.CrossPlat.yml@onebranchTemplates' ) }}
5449

5550
resources:
5651
repositories:
@@ -72,7 +67,7 @@ resources:
7267
- releases/*
7368

7469
extends:
75-
template: ${{ variables.templateFile }}
70+
template: v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates
7671
parameters:
7772
featureFlags:
7873
WindowsHostVersion:

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,8 @@ parameters: # parameters are shown up in ADO UI in a build queue time
2929
displayName: Skip MSIX Publish
3030
type: boolean
3131
default: false
32-
- name: OfficialBuild
33-
type: boolean
34-
default: false
3532

36-
name: release-$(BUILD.SOURCEBRANCHNAME)-prod.${{ parameters.OfficialBuild }}-$(Build.BuildId)
33+
name: release-$(BUILD.SOURCEBRANCHNAME)-prod.true-$(Build.BuildId)
3734

3835
variables:
3936
- name: CDP_DEFINITION_BUILD_COUNT
@@ -65,10 +62,8 @@ variables:
6562
- name: ReleaseTagVar
6663
value: ${{ parameters.ReleaseTagVar }}
6764
- group: PoolNames
68-
- name: templateFile
69-
value: ${{ iif ( parameters.OfficialBuild, 'v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates', 'v2/OneBranch.NonOfficial.CrossPlat.yml@onebranchTemplates' ) }}
7065
- name: releaseEnvironment
71-
value: ${{ iif ( parameters.OfficialBuild, 'Production', 'Test' ) }}
66+
value: 'Production'
7267
# Fix for BinSkim ICU package error in Linux containers
7368
- name: DOTNET_SYSTEM_GLOBALIZATION_INVARIANT
7469
value: true
@@ -97,7 +92,7 @@ resources:
9792
- releases/*
9893

9994
extends:
100-
template: ${{ variables.templateFile }}
95+
template: v2/OneBranch.Official.CrossPlat.yml@onebranchTemplates
10196
parameters:
10297
release:
10398
category: NonAzure

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
trigger: none
22

33
parameters: # parameters are shown up in ADO UI in a build queue time
4-
- name: OfficialBuild
5-
type: boolean
6-
default: true
74
- name: 'createVPack'
85
displayName: 'Create and Submit VPack'
96
type: boolean
@@ -33,7 +30,7 @@ parameters: # parameters are shown up in ADO UI in a build queue time
3330
- Netlock
3431
default: "R1"
3532

36-
name: vPack_$(Build.SourceBranchName)_Prod.${{ parameters.OfficialBuild }}_Create.${{ parameters.createVPack }}_Name.${{ parameters.vPackName}}_$(date:yyyyMMdd).$(rev:rr)
33+
name: vPack_$(Build.SourceBranchName)_Prod.true_Create.${{ parameters.createVPack }}_Name.${{ parameters.vPackName}}_$(date:yyyyMMdd).$(rev:rr)
3734

3835
variables:
3936
- name: CDP_DEFINITION_BUILD_COUNT
@@ -58,8 +55,6 @@ variables:
5855
value: ${{ parameters.ReleaseTagVar }}
5956
- group: Azure Blob variable group
6057
- group: certificate_logical_to_actual # used within signing task
61-
- name: templateFile
62-
value: ${{ iif ( parameters.OfficialBuild, 'v2/Microsoft.Official.yml@onebranchTemplates', 'v2/Microsoft.NonOfficial.yml@onebranchTemplates' ) }}
6358
- group: DotNetPrivateBuildAccess
6459
- group: certificate_logical_to_actual
6560
- name: netiso
@@ -75,7 +70,7 @@ resources:
7570
ref: refs/heads/main
7671

7772
extends:
78-
template: ${{ variables.templateFile }}
73+
template: v2/Microsoft.Official.yml@onebranchTemplates
7974
parameters:
8075
platform:
8176
name: 'windows_undocked' # windows undocked

0 commit comments

Comments
 (0)