Skip to content

Commit 493a702

Browse files
authored
Build the PGO build legs through the global build job template (#92296)
* Build the PGO build legs through the global build job template. * Remove pgoType parameters and plumbing from all jobs and use the -pgoinstrument flag instead of setting the property manually. * Limit subsets to build to limit packages and don't build crossgen2 sfxproj for internal optimization pipelines (we don't use it). * Fix job dependencies now that the non-global jobs don't have PGO type in the name * Change back to the triple-underscore name * Fix Mono artifacts to not have an extra underscore for PGO scenarios. * There's an extra underscore for the CoreCLR artifacts because there's no runtime variant.
1 parent b2417c3 commit 493a702

File tree

14 files changed

+48
-95
lines changed

14 files changed

+48
-95
lines changed

eng/Subsets.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@
511511
</ItemGroup>
512512
<ItemGroup Condition="'$(BuildNativeAOTRuntimePack)' != 'true'">
513513
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Host.sfxproj" />
514-
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' != 'Mono'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Crossgen2.sfxproj" />
514+
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' != 'Mono' and '$(PgoInstrument)' != 'true'" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\Microsoft.NETCore.App.Crossgen2.sfxproj" />
515515
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-host.proj" />
516516
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-hostfxr.proj" />
517517
<SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-runtime-deps\*.proj" />

eng/pipelines/common/global-build-job.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ parameters:
1414
dependsOn: []
1515
pool: ''
1616
platform: ''
17-
pgoType: ''
1817
condition: true
1918
useContinueOnErrorDuringBuild: false
2019
shouldContinueOnError: false
@@ -134,7 +133,6 @@ jobs:
134133
targetRid: ${{ parameters.targetRid }}
135134
nameSuffix: ${{ parameters.nameSuffix }}
136135
platform: ${{ parameters.platform }}
137-
pgoType: ${{ parameters.pgoType }}
138136
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
139137
${{ if ne(variableTemplate.forwardedParameters, '') }}:
140138
${{ each parameter in variableTemplate.forwardedParameters }}:
@@ -275,7 +273,6 @@ jobs:
275273
targetRid: ${{ parameters.targetRid }}
276274
nameSuffix: ${{ parameters.nameSuffix }}
277275
platform: ${{ parameters.platform }}
278-
pgoType: ${{ parameters.pgoType }}
279276
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
280277
${{ insert }}: ${{ parameters.extraStepsParameters }}
281278

eng/pipelines/common/templates/runtimes/build-test-job.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ parameters:
1414
dependsOn: []
1515
dependOnEvaluatePaths: false
1616
crossBuild: false
17-
pgoType: ''
1817

1918
### Build managed test components (native components are getting built as part
2019
### of the product build job).

eng/pipelines/coreclr/templates/build-job.yml

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ parameters:
1717
testGroup: ''
1818
timeoutInMinutes: ''
1919
variables: {}
20-
pgoType: ''
2120

2221
### Product build
2322
jobs:
@@ -36,21 +35,18 @@ jobs:
3635
dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}
3736
disableComponentGovernance: ${{ parameters.disableComponentGovernance }}
3837
disableClrTest: ${{ parameters.disableClrTest }}
39-
pgoType: ${{ parameters.pgoType }}
4038

4139
# Compute job name from template parameters
42-
name: ${{ format('coreclr_{0}_product_build_{1}{2}_{3}_{4}{5}',
40+
name: ${{ format('coreclr_{0}_product_build_{1}{2}_{3}_{4}',
4341
parameters.runtimeVariant,
4442
parameters.osGroup,
4543
parameters.osSubgroup,
4644
parameters.archType,
47-
parameters.buildConfig,
48-
parameters.pgoType) }}
49-
displayName: ${{ format('CoreCLR {0} Product Build {1}{2} {3} {4} {5}',
45+
parameters.buildConfig) }}
46+
displayName: ${{ format('CoreCLR {0} Product Build {1}{2} {3} {4}',
5047
parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup,
5148
parameters.archType,
52-
parameters.buildConfig,
53-
parameters.pgoType) }}
49+
parameters.buildConfig) }}
5450

5551
# Run all steps in the container.
5652
# Note that the containers are defined in platform-matrix.yml
@@ -78,7 +74,7 @@ jobs:
7874
- name: enforcePgoArg
7975
value: ''
8076
# The EnforcePGO script is only supported on Windows and is not supported on arm64.
81-
- ${{ if and(eq(parameters.buildConfig, 'Release'), and(eq(parameters.osGroup, 'windows'), ne(parameters.archType, 'arm64')), ne(parameters.pgoType, 'pgo')) }}:
77+
- ${{ if and(eq(parameters.buildConfig, 'Release'), and(eq(parameters.osGroup, 'windows'), ne(parameters.archType, 'arm64'))) }}:
8278
- name: enforcePgoArg
8379
value: '-enforcepgo'
8480

@@ -94,12 +90,6 @@ jobs:
9490
- name: clrRuntimeComponentsBuildArg
9591
value: '-component runtime -component alljits -component nativeaot -component spmi '
9692

97-
- name: pgoInstrumentArg
98-
value: ''
99-
- ${{ if eq(parameters.pgoType, 'PGO' )}}:
100-
- name: pgoInstrumentArg
101-
value: '-pgoinstrument '
102-
10393
- name: SignType
10494
value: $[ coalesce(variables.OfficialSignType, 'real') ]
10595

@@ -173,10 +163,10 @@ jobs:
173163

174164
# Build CoreCLR Runtime
175165
- ${{ if ne(parameters.osGroup, 'windows') }}:
176-
- script: $(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) $(crossArg) $(osArg) -ci $(compilerArg) $(clrRuntimeComponentsBuildArg) $(pgoInstrumentArg) $(officialBuildIdArg) $(clrInterpreterBuildArg) $(CoreClrPgoDataArg) $(nativeSymbols)
166+
- script: $(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) $(crossArg) $(osArg) -ci $(compilerArg) $(clrRuntimeComponentsBuildArg) $(officialBuildIdArg) $(clrInterpreterBuildArg) $(CoreClrPgoDataArg) $(nativeSymbols)
177167
displayName: Build CoreCLR Runtime
178168
- ${{ if eq(parameters.osGroup, 'windows') }}:
179-
- script: $(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci $(enforcePgoArg) $(pgoInstrumentArg) $(officialBuildIdArg) $(clrInterpreterBuildArg) $(CoreClrPgoDataArg)
169+
- script: $(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci $(enforcePgoArg) $(officialBuildIdArg) $(clrInterpreterBuildArg) $(CoreClrPgoDataArg)
180170
displayName: Build CoreCLR Runtime
181171

182172
- ${{ if or(eq(parameters.crossBuild, 'true'), ne(parameters.archType, 'x64')) }}:
@@ -190,7 +180,7 @@ jobs:
190180
displayName: Disk Usage after Build
191181
192182
# Build CoreCLR Managed Components
193-
- script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -subset clr.corelib+clr.nativecorelib+clr.nativeaotlibs+clr.tools+clr.packages $(crossArg) $(compilerArg) -arch $(archType) $(osArg) -c $(buildConfig) $(pgoInstrumentArg) $(officialBuildIdArg) -ci
183+
- script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -subset clr.corelib+clr.nativecorelib+clr.nativeaotlibs+clr.tools+clr.packages $(crossArg) $(compilerArg) -arch $(archType) $(osArg) -c $(buildConfig) $(officialBuildIdArg) -ci
194184
displayName: Build managed product components and packages
195185

196186
# Build native test components
@@ -239,7 +229,7 @@ jobs:
239229
artifactName: $(buildProductArtifactName)
240230
displayName: 'product build'
241231

242-
- ${{ if and(in(parameters.osGroup, 'windows', 'linux'), ne(parameters.archType, 'x86'), eq(parameters.pgoType, '')) }}:
232+
- ${{ if and(in(parameters.osGroup, 'windows', 'linux'), ne(parameters.archType, 'x86')) }}:
243233
- template: /eng/pipelines/coreclr/templates/crossdac-build.yml
244234
parameters:
245235
archType: ${{ parameters.archType }}
@@ -251,7 +241,7 @@ jobs:
251241
${{ else }}:
252242
hostArchType: x64
253243

254-
- ${{ if and(in(parameters.osGroup, 'windows'), eq(parameters.archType, 'x86'), eq(parameters.pgoType, '')) }}:
244+
- ${{ if and(in(parameters.osGroup, 'windows'), eq(parameters.archType, 'x86')) }}:
255245
- template: /eng/pipelines/coreclr/templates/crossdac-build.yml
256246
parameters:
257247
archType: arm
@@ -262,7 +252,7 @@ jobs:
262252

263253
- ${{ if and(ne(parameters.testGroup, ''), ne(parameters.disableClrTest, true)) }}:
264254
# Publish test native components for consumption by test execution.
265-
- ${{ if and(ne(parameters.isOfficialBuild, true), eq(parameters.pgoType, '')) }}:
255+
- ${{ if ne(parameters.isOfficialBuild, true) }}:
266256
- template: /eng/pipelines/common/upload-artifact-step.yml
267257
parameters:
268258
rootFolder: $(nativeTestArtifactRootFolderPath)
@@ -274,7 +264,7 @@ jobs:
274264
displayName: 'native test components'
275265

276266
# Save packages using the prepare-signed-artifacts format.
277-
- ${{ if and(eq(parameters.isOfficialBuild, true), eq(parameters.pgoType, '')) }}:
267+
- ${{ if eq(parameters.isOfficialBuild, true) }}:
278268
- template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
279269
parameters:
280270
name: ${{ parameters.platform }}
@@ -290,6 +280,6 @@ jobs:
290280
displayName: Publish Logs
291281
inputs:
292282
targetPath: $(Build.SourcesDirectory)/artifacts/log
293-
artifactName: '$(publishLogsArtifactPrefix)_Attempt$(System.JobAttempt)_${{ parameters.pgoType }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
283+
artifactName: '$(publishLogsArtifactPrefix)_Attempt$(System.JobAttempt)_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
294284
continueOnError: true
295285
condition: always()

eng/pipelines/coreclr/templates/superpmi-asmdiffs-checked-release-job.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: releaseProductRootFolderPath
3535
value: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).Release'
3636
- name: releaseProductArtifactName
37-
value: 'CoreCLRProduct_${{ parameters.pgoType }}_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_release'
37+
value: 'CoreCLRProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_release'
3838

3939
steps:
4040

eng/pipelines/coreclr/templates/superpmi-diffs-job.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
- name: releaseProductRootFolderPath
5050
value: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).Release'
5151
- name: releaseProductArtifactName
52-
value: 'CoreCLRProduct_${{ parameters.pgoType }}_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_release'
52+
value: 'CoreCLRProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_release'
5353

5454
steps:
5555

eng/pipelines/coreclr/templates/xplat-pipeline-job.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ jobs:
3838
crossBuild: ${{ parameters.crossBuild }}
3939
strategy: ${{ parameters.strategy }}
4040
pool: ${{ parameters.pool }}
41-
pgoType: ${{ parameters.pgoType }}
4241

4342
# arcade-specific parameters
4443
condition: and(succeeded(), ${{ parameters.condition }})
@@ -65,7 +64,7 @@ jobs:
6564

6665
# Build product defines what we are trying to build, either coreclr or mono
6766
- name: buildProductArtifactName
68-
value: 'CoreCLRProduct_${{ parameters.pgoType }}_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
67+
value: 'CoreCLRProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
6968

7069
- name: buildProductRootFolderPath
7170
value: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).$(buildConfigUpper)'
@@ -78,13 +77,13 @@ jobs:
7877

7978
# We need this because both mono and coreclr build currently depends on CoreClr
8079
- name: coreClrProductArtifactName
81-
value: 'CoreCLRProduct_${{ parameters.pgoType }}_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
80+
value: 'CoreCLRProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
8281

8382
- name: coreClrProductRootFolderPath
8483
value: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).$(buildConfigUpper)'
8584

8685
- name: corelibProductArtifactName
87-
value: 'CoreLib_${{ parameters.pgoType }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
86+
value: 'CoreLib_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
8887

8988
- name: managedGenericTestArtifactName
9089
value: 'CoreCLRManagedTestArtifacts_AnyOS_AnyCPU_$(buildConfig)'

eng/pipelines/installer/jobs/build-job.yml

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ parameters:
1919
displayName: ''
2020
runtimeVariant: ''
2121
pool: ''
22-
pgoType: ''
2322
runOnlyIfDependenciesSucceeded: false
2423

2524
# The target names here should match container names in the resources section in our pipelines, like runtime.yml
@@ -59,11 +58,10 @@ jobs:
5958

6059
dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}
6160
disableClrTest: ${{ parameters.disableClrTest }}
62-
pgoType: ${{ parameters.pgoType }}
6361

6462
# Compute job name from template parameters
65-
name: ${{ format('installer_{0}_{1}_{2}_{3}_{4}_', parameters.pgoType, parameters.runtimeFlavor, parameters.runtimeVariant, coalesce(parameters.name, parameters.platform), parameters.buildConfig) }}
66-
displayName: ${{ format('{0} Installer Build and Test {1} {2} {3} {4}', parameters.pgoType, parameters.runtimeFlavor, parameters.runtimeVariant, coalesce(parameters.name, parameters.platform), parameters.buildConfig) }}
63+
name: ${{ format('installer_{0}_{1}_{2}_{3}_', parameters.runtimeFlavor, parameters.runtimeVariant, coalesce(parameters.name, parameters.platform), parameters.buildConfig) }}
64+
displayName: ${{ format('Installer Build and Test {0} {1} {2} {3}', parameters.runtimeFlavor, parameters.runtimeVariant, coalesce(parameters.name, parameters.platform), parameters.buildConfig) }}
6765

6866
# Run all steps in the container.
6967
# Note that the containers are defined in platform-matrix.yml
@@ -99,25 +97,18 @@ jobs:
9997
not(and(
10098
eq(parameters.osGroup, 'linux'),
10199
eq(parameters.osSubgroup, ''))
102-
)),
103-
eq(parameters.pgoType, 'PGO')) }}
100+
))) }}
104101

105102
- name: BuildAction
106103
value: -test
107104

108-
- ${{ if eq(or(not(in(parameters.archType, 'x64', 'x86')), eq(parameters.runtimeFlavor, 'mono'), eq(parameters.isOfficialBuild, true), and(eq(parameters.crossBuild, true), not(and(eq(parameters.osGroup, 'linux'), eq(parameters.osSubgroup, '')))), eq(parameters.pgoType, 'PGO')), true) }}:
105+
- ${{ if eq(or(not(in(parameters.archType, 'x64', 'x86')), eq(parameters.runtimeFlavor, 'mono'), eq(parameters.isOfficialBuild, true), and(eq(parameters.crossBuild, true), not(and(eq(parameters.osGroup, 'linux'), eq(parameters.osSubgroup, ''))))), true) }}:
109106
- name: BuildAction
110107
value: ''
111108

112109
- name: SignType
113110
value: test
114111

115-
- name: pgoInstrumentArg
116-
value: ''
117-
- ${{ if eq(parameters.pgoType, 'PGO' )}}:
118-
- name: pgoInstrumentArg
119-
value: '-pgoinstrument '
120-
121112
# Set up non-PR build from internal project
122113
- ${{ if eq(parameters.isOfficialBuild, true) }}:
123114
- name: SignType
@@ -153,7 +144,6 @@ jobs:
153144
build.cmd -subset host+packs -ci
154145
$(BuildAction)
155146
-configuration $(_BuildConfig)
156-
$(pgoInstrumentArg)
157147
$(LiveOverridePathArgs)
158148
$(CommonMSBuildArgs)
159149
$(MsbuildSigningArguments)
@@ -225,7 +215,6 @@ jobs:
225215
/p:CrossBuild=${{ parameters.crossBuild }}
226216
/p:PortableBuild=$(_PortableBuild)
227217
/p:SkipTests=$(SkipTests)
228-
$(pgoInstrumentArg)
229218
$(LiveOverridePathArgs)
230219
$(CommonMSBuildArgs)
231220
@@ -265,7 +254,7 @@ jobs:
265254
/p:RuntimeArtifactsPath=$(buildCommandSourcesDirectory)$(RuntimeDownloadPath)
266255
/p:RuntimeConfiguration=${{ parameters.liveRuntimeBuildConfig }}
267256
- name: RuntimeArtifactName
268-
value: $(runtimeFlavorName)Product_${{ parameters.pgoType }}_${{ parameters.runtimeVariant }}_$(liveRuntimeLegName)
257+
value: $(runtimeFlavorName)Product_${{ parameters.runtimeVariant }}_$(liveRuntimeLegName)
269258

270259
- ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
271260
- name: liveLibrariesLegName
@@ -286,14 +275,13 @@ jobs:
286275
- evaluate_paths
287276
- ${{ parameters.dependsOn }}
288277
- ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
289-
- ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}{6}',
278+
- ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}',
290279
parameters.runtimeFlavor,
291280
parameters.runtimeVariant,
292281
parameters.osGroup,
293282
parameters.osSubgroup,
294283
parameters.archType,
295-
parameters.liveRuntimeBuildConfig,
296-
parameters.pgoType) }}
284+
parameters.liveRuntimeBuildConfig) }}
297285
- ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
298286
- libraries_build_${{ format('{0}{1}_{2}_{3}',
299287
parameters.osGroup,
@@ -416,7 +404,7 @@ jobs:
416404
displayName: Disk Usage after Build
417405
418406
# Only in glibc leg, we produce RPMs and Debs
419-
- ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), or(eq(parameters.platform, 'linux_x64'), eq(parameters.platform, 'linux_arm64')), eq(parameters.osSubgroup, ''), eq(parameters.pgoType, ''))}}:
407+
- ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), or(eq(parameters.platform, 'linux_x64'), eq(parameters.platform, 'linux_arm64')), eq(parameters.osSubgroup, ''))}}:
420408
- ${{ each packageBuild in parameters.packageDistroList }}:
421409
# This leg's RID matches the build image. Build its distro-dependent packages, as well as
422410
# the distro-independent installers. (There's no particular reason to build the distro-
@@ -437,7 +425,6 @@ jobs:
437425
runtimeFlavor: ${{ parameters.runtimeFlavor }}
438426
runtimeVariant: ${{ parameters.runtimeVariant }}
439427
isOfficialBuild: ${{ eq(parameters.isOfficialBuild, true) }}
440-
pgoType: ${{ parameters.pgoType }}
441428
skipTests: ${{ eq(variables.SkipTests, true) }}
442429

443430
- ${{ if ne(parameters.osGroup, 'windows') }}:

eng/pipelines/installer/jobs/steps/upload-job-artifacts.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ parameters:
33
runtimeFlavor: 'coreclr'
44
runtimeVariant: ''
55
isOfficialBuild: false
6-
pgoType: ''
76

87
steps:
98
# Upload build artifacts (packages) to pipeline only if official, to save storage space.
@@ -51,7 +50,7 @@ steps:
5150
displayName: Publish binaries
5251
inputs:
5352
pathtoPublish: '$(Build.StagingDirectory)/corehost-bin-${{ parameters.name }}-$(_BuildConfig)$(archiveExtension)'
54-
artifactName: Installer-Binaries-${{parameters.pgoType }}${{ parameters.runtimeFlavor }}-${{ parameters.runtimeVariant }}-${{ parameters.name }}-$(_BuildConfig)
53+
artifactName: Installer-Binaries-${{ parameters.runtimeFlavor }}-${{ parameters.runtimeVariant }}-${{ parameters.name }}-$(_BuildConfig)
5554
continueOnError: true
5655
condition: failed()
5756

@@ -71,6 +70,6 @@ steps:
7170
displayName: Publish BuildLogs
7271
inputs:
7372
targetPath: '$(Build.StagingDirectory)/BuildLogs'
74-
artifactName: Installer-Logs_Attempt$(System.JobAttempt)-${{parameters.pgoType }}${{ parameters.runtimeFlavor }}-${{ parameters.runtimeVariant }}-${{ parameters.name }}-$(_BuildConfig)
73+
artifactName: Installer-Logs_Attempt$(System.JobAttempt)-${{ parameters.runtimeFlavor }}-${{ parameters.runtimeVariant }}-${{ parameters.name }}-$(_BuildConfig)
7574
continueOnError: true
7675
condition: always()

eng/pipelines/libraries/base-job.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ parameters:
2323
testScope: ''
2424
pool: ''
2525
runTests: false
26-
pgoType: ''
2726
SuperPmiCollect: false
2827

2928
jobs:
@@ -99,7 +98,7 @@ jobs:
9998
- _runtimeDownloadPath: '$(Build.SourcesDirectory)/artifacts/transport/${{ parameters.runtimeFlavor }}'
10099
- _runtimeConfigurationArg: -rc ${{ parameters.liveRuntimeBuildConfig }}
101100
- ${{ if eq(parameters.runTests, true) }}:
102-
- _runtimeArtifactName: '$(runtimeFlavorName)Product_${{ parameters.pgoType }}_${{ parameters.runtimeVariant}}_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.liveRuntimeBuildConfig }}'
101+
- _runtimeArtifactName: '$(runtimeFlavorName)Product_${{ parameters.runtimeVariant}}_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.liveRuntimeBuildConfig }}'
103102
- _runtimeArtifactsPathArg: ' /p:RuntimeArtifactsPath=$(_runtimeDownloadPath)'
104103
- ${{ if eq(parameters.testDisplayName, '') }}:
105104
- _testRunNamePrefixSuffix: $(runtimeFlavorName)_${{ parameters.liveRuntimeBuildConfig }}

0 commit comments

Comments
 (0)