Skip to content

Commit 4ce3525

Browse files
authored
Use Arcade log publishing instead of our own publishing (#100566)
1 parent fc9ab41 commit 4ce3525

File tree

8 files changed

+27
-74
lines changed

8 files changed

+27
-74
lines changed

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

+8-14
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,14 @@ jobs:
6060
enableRichCodeNavigation: ${{ parameters.enableRichCodeNavigation }}
6161
richCodeNavigationLanguage: ${{ parameters.richCodeNavigationLanguage }}
6262

63+
artifacts:
64+
publish:
65+
logs:
66+
${{ if notin(parameters.osGroup, 'browser', 'wasi') }}:
67+
name: Logs_Build_Attempt$(System.JobAttempt)_${{ parameters.osGroup }}_${{ parameters.osSubGroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}_${{ parameters.nameSuffix }}
68+
${{ if in(parameters.osGroup, 'browser', 'wasi') }}:
69+
name: Logs_Build_Attempt$(System.JobAttempt)_${{ parameters.osGroup }}_${{ parameters.archType }}_${{ parameters.hostedOs }}_${{ parameters.buildConfig }}_${{ parameters.nameSuffix }}
70+
6371
# Component governance does not work on musl machines
6472
${{ if eq(parameters.osSubGroup, '_musl') }}:
6573
disableComponentGovernance: true
@@ -283,17 +291,3 @@ jobs:
283291
- powershell: ./eng/collect_vsinfo.ps1 -ArchiveRunName postbuild_log
284292
displayName: Collect vslogs on exit
285293
condition: always()
286-
287-
- template: /eng/pipelines/common/templates/publish-build-artifacts.yml
288-
parameters:
289-
isOfficialBuild: ${{ parameters.isOfficialBuild }}
290-
displayName: Publish Logs
291-
inputs:
292-
PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/'
293-
PublishLocation: Container
294-
${{ if notin(parameters.osGroup, 'browser', 'wasi') }}:
295-
ArtifactName: Logs_Build_Attempt$(System.JobAttempt)_${{ parameters.osGroup }}_${{ parameters.osSubGroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}_${{ parameters.nameSuffix }}
296-
${{ if in(parameters.osGroup, 'browser', 'wasi') }}:
297-
ArtifactName: Logs_Build_Attempt$(System.JobAttempt)_${{ parameters.osGroup }}_${{ parameters.archType }}_${{ parameters.hostedOs }}_${{ parameters.buildConfig }}_${{ parameters.nameSuffix }}
298-
continueOnError: true
299-
condition: always()

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

+5-11
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ jobs:
5656
${{ if notIn(parameters.testGroup, 'innerloop', 'clrinterpreter') }}:
5757
timeoutInMinutes: 160
5858

59+
artifacts:
60+
publish:
61+
logs:
62+
name: '${{ parameters.runtimeFlavor }}_Common_Runtime_TestBuildLogs_Attempt$(System.JobAttempt)_AnyOS_AnyCPU_$(buildConfig)_${{ parameters.testGroup }}'
63+
5964
variables:
6065
- ${{ each variable in parameters.variables }}:
6166
- ${{ variable }}
@@ -137,14 +142,3 @@ jobs:
137142
archiveExtension: '.tar.gz'
138143
artifactName: $(microsoftNetSdkIlArtifactName)
139144
displayName: 'Microsoft.NET.Sdk.IL package'
140-
141-
# Publish Logs
142-
- template: /eng/pipelines/common/templates/publish-pipeline-artifacts.yml
143-
parameters:
144-
displayName: Publish Logs
145-
isOfficialBuild: ${{ parameters.isOfficialBuild }}
146-
inputs:
147-
targetPath: $(Build.SourcesDirectory)/artifacts/log
148-
ArtifactName: '${{ parameters.runtimeFlavor }}_Common_Runtime_TestBuildLogs_Attempt$(System.JobAttempt)_AnyOS_AnyCPU_$(buildConfig)_${{ parameters.testGroup }}'
149-
continueOnError: true
150-
condition: always()

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

+1-9
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ jobs:
4747
runtimeVariant: ${{ parameters.runtimeVariant }}
4848
pool: ${{ parameters.pool }}
4949
condition: and(succeeded(), ${{ parameters.condition }})
50+
logsName: '${{ parameters.runtimeFlavor }}_${{ parameters.runtimeVariant }}_$(LogNamePrefix)_Attempt$(System.JobAttempt)_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.testGroup }}'
5051

5152
# Test jobs should continue on error for internal builds
5253
${{ if eq(variables['System.TeamProject'], 'internal') }}:
@@ -561,15 +562,6 @@ jobs:
561562
scenarios:
562563
- clrinterpreter
563564

564-
# Publish Logs
565-
- task: PublishPipelineArtifact@1
566-
displayName: Publish Logs
567-
inputs:
568-
targetPath: $(Build.SourcesDirectory)/artifacts/log
569-
artifactName: '${{ parameters.runtimeFlavor }}_${{ parameters.runtimeVariant }}_$(LogNamePrefix)_Attempt$(System.JobAttempt)_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.testGroup }}'
570-
continueOnError: true
571-
condition: always()
572-
573565
########################################################################################################
574566
#
575567
# Finalize SuperPMI collection: (1) merge all MCH files generated by all Helix jobs, (2) upload MCH file to Azure Storage, (3) upload log files

eng/pipelines/common/templates/runtimes/xplat-job.yml

+7
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ parameters:
99
crossBuild: false
1010
strategy: ''
1111
pool: ''
12+
logsName: ''
1213

1314
# arcade-specific parameters
1415
condition: ''
@@ -73,6 +74,12 @@ jobs:
7374
# storage. Only relevant for build jobs.
7475
enablePublishBuildAssets: ${{ parameters.gatherAssetManifests }}
7576

77+
artifacts:
78+
publish:
79+
${{ if ne(parameters.logsName, '') }}:
80+
logs:
81+
name: '${{ parameters.logsName }}'
82+
7683
variables:
7784
- name: buildConfig
7885
value: ${{ parameters.buildConfig }}

eng/pipelines/coreclr/templates/run-performance-job.yml

+3-9
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ jobs:
5151

5252
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
5353

54+
logsName: 'Performance_Run_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.runtimeType }}_${{ parameters.codeGenType }}_${{ parameters.runKind }}_${{ parameters.logicalMachine }}_${{ parameters.javascriptEngine }}_${{ parameters.pgoRunType }}_${{ parameters.physicalPromotionRunType }}_${{ parameters.r2rRunType }}_${{ parameters.experimentName }}'
55+
5456
variables:
5557
- ${{ each variable in parameters.variables }}:
5658
- ${{insert}}: ${{ variable }}
@@ -153,7 +155,6 @@ jobs:
153155
- HelixPreCommand: 'export MONO_ENV_OPTIONS="--interpreter";$(ExtraMSBuildLogsLinux)'
154156
- Interpreter: ' --monointerpreter'
155157

156-
157158
workspace:
158159
clean: all
159160
pool:
@@ -191,11 +192,4 @@ jobs:
191192
WorkItemDirectory: '$(WorkItemDirectory)' # WorkItemDirectory can not be empty, so we send it some docs to keep it happy
192193
CorrelationPayloadDirectory: '$(PayloadDirectory)' # it gets checked out to a folder with shorter path than WorkItemDirectory so we can avoid file name too long exceptions
193194
ProjectFile: ${{ parameters.projectFile }}
194-
osGroup: ${{ parameters.osGroup }}
195-
- task: PublishPipelineArtifact@1
196-
displayName: Publish Logs
197-
inputs:
198-
targetPath: $(Build.SourcesDirectory)/artifacts/log
199-
artifactName: 'Performance_Run_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.runtimeType }}_${{ parameters.codeGenType }}_${{ parameters.runKind }}_${{ parameters.logicalMachine }}_${{ parameters.javascriptEngine }}_${{ parameters.pgoRunType }}_${{ parameters.physicalPromotionRunType }}_${{ parameters.r2rRunType }}_${{ parameters.experimentName }}'
200-
continueOnError: true
201-
condition: always()
195+
osGroup: ${{ parameters.osGroup }}

eng/pipelines/coreclr/templates/run-scenarios-job.yml

+1-9
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
enableTelemetry: ${{ parameters.enableTelemetry }}
3535
enablePublishBuildArtifacts: true
3636
continueOnError: ${{ parameters.continueOnError }}
37+
logsName: 'Performance_Run_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.runtimeType }}_${{ parameters.codeGenType }}_${{ parameters.runKind }}_$(iOSLlvmBuild)_$(iOSStripSymbols)_$(hybridGlobalization)'
3738

3839
${{ if ne(parameters.displayName, '') }}:
3940
displayName: '${{ parameters.displayName }}'
@@ -213,12 +214,3 @@ jobs:
213214
CorrelationPayloadDirectory: '$(PayloadDirectory)' # contains performance repo and built product
214215
ProjectFile: ${{ parameters.projectFile }}
215216
osGroup: ${{ parameters.osGroup }}
216-
217-
# publish logs
218-
- task: PublishPipelineArtifact@1
219-
displayName: Publish Logs
220-
inputs:
221-
targetPath: $(Build.SourcesDirectory)/artifacts/log
222-
artifactName: 'Performance_Run_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.runtimeType }}_${{ parameters.codeGenType }}_${{ parameters.runKind }}_$(iOSLlvmBuild)_$(iOSStripSymbols)_$(hybridGlobalization)'
223-
continueOnError: true
224-
condition: always()

eng/pipelines/mono/templates/generate-offsets.yml

+1-11
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
pool: ${{ parameters.pool }}
2525
condition: ${{ parameters.condition }}
2626
dependOnEvaluatePaths: ${{ parameters.dependOnEvaluatePaths }}
27+
logsName: 'BuildLogs_Attempt$(System.JobAttempt)_Mono_Offsets_$(osGroup)$(osSubGroup)'
2728

2829
# Compute job name from template parameters
2930
name: ${{ format('mono_{0}{1}_offsets', parameters.osGroup, parameters.osSubGroup) }}
@@ -85,14 +86,3 @@ jobs:
8586
inputs:
8687
targetPath: '$(Build.SourcesDirectory)/artifacts/obj/mono/offsetfiles'
8788
artifactName: 'Mono_Offsets_$(osGroup)$(osSubGroup)'
88-
89-
# Publish Logs
90-
- template: /eng/pipelines/common/templates/publish-pipeline-artifacts.yml
91-
parameters:
92-
displayName: Publish Logs
93-
isOfficialBuild: ${{ parameters.isOfficialBuild }}
94-
inputs:
95-
targetPath: $(Build.SourcesDirectory)/artifacts/log
96-
artifactName: 'BuildLogs_Attempt$(System.JobAttempt)_Mono_Offsets_$(osGroup)$(osSubGroup)'
97-
continueOnError: true
98-
condition: always()

eng/pipelines/mono/templates/workloads-build.yml

+1-11
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
pool: ${{ parameters.pool }}
2929
runtimeVariant: ${{ parameters.runtimeVariant }}
3030
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
31+
logsName: WorkloadLogs_Attempt$(System.JobAttempt)
3132

3233
dependsOn: ${{ parameters.dependsOn }}
3334

@@ -100,17 +101,6 @@ jobs:
100101
parameters:
101102
name: workloads
102103

103-
# Publish Logs
104-
- template: /eng/pipelines/common/templates/publish-pipeline-artifacts.yml
105-
parameters:
106-
displayName: Publish Logs
107-
isOfficialBuild: ${{ parameters.isOfficialBuild }}
108-
inputs:
109-
targetPath: $(Build.SourcesDirectory)/artifacts/log
110-
artifactName: 'WorkloadLogs_Attempt$(System.JobAttempt)'
111-
continueOnError: true
112-
condition: always()
113-
114104
# Delete wixpdb files before they are uploaded to artifacts
115105
- task: DeleteFiles@1
116106
displayName: Delete wixpdb's

0 commit comments

Comments
 (0)