Skip to content

Commit bbacc8a

Browse files
vseanreesermsftvseanreesermsft
authored
Merge pull request #56897 from vseanreesermsft/ci-attempt-number-artifact-names
Add Job Attempt Number to Artifact Names for Logs and Test Results
2 parents dfc5189 + 8def589 commit bbacc8a

File tree

3 files changed

+35
-35
lines changed

3 files changed

+35
-35
lines changed

‎.azure/pipelines/ci-public.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ stages:
101101
- powershell: ./eng/scripts/CodeCheck.ps1 -ci $(_InternalRuntimeDownloadArgs)
102102
displayName: Run eng/scripts/CodeCheck.ps1
103103
artifacts:
104-
- name: Code_Check_Logs
104+
- name: Code_Check_Logs_Attempt_$(System.JobAttempt)
105105
path: artifacts/log/
106106
publishOnError: true
107107
includeForks: true
@@ -227,7 +227,7 @@ stages:
227227
displayName: Build ARM64 Installers
228228

229229
artifacts:
230-
- name: Windows_Logs
230+
- name: Windows_Logs_Attempt_$(System.JobAttempt)
231231
path: artifacts/log/
232232
publishOnError: true
233233
includeForks: true
@@ -259,7 +259,7 @@ stages:
259259
$(_PublishArgs)
260260
$(_InternalRuntimeDownloadArgs)
261261
artifacts:
262-
- name: MacOS_arm64_Logs
262+
- name: MacOS_arm64_Logs_Attempt_$(System.JobAttempt)
263263
path: artifacts/log/
264264
publishOnError: true
265265
includeForks: true
@@ -289,7 +289,7 @@ stages:
289289
$(_PublishArgs)
290290
$(_InternalRuntimeDownloadArgs)
291291
artifacts:
292-
- name: MacOS_x64_Logs
292+
- name: MacOS_x64_Logs_Attempt_$(System.JobAttempt)
293293
path: artifacts/log/
294294
publishOnError: true
295295
includeForks: true
@@ -351,7 +351,7 @@ stages:
351351
displayName: Build RPM installers
352352
target: rpmpkg
353353
artifacts:
354-
- name: Linux_x64_Logs
354+
- name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
355355
path: artifacts/log/
356356
publishOnError: true
357357
includeForks: true
@@ -381,7 +381,7 @@ stages:
381381
$(_PublishArgs)
382382
$(_InternalRuntimeDownloadArgs)
383383
artifacts:
384-
- name: Linux_arm_Logs
384+
- name: Linux_arm_Logs_Attempt_$(System.JobAttempt)
385385
path: artifacts/log/
386386
publishOnError: true
387387
includeForks: true
@@ -428,7 +428,7 @@ stages:
428428
displayName: Build RPM installers
429429
target: rpmpkg
430430
artifacts:
431-
- name: Linux_arm64_Logs
431+
- name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
432432
path: artifacts/log/
433433
publishOnError: true
434434
includeForks: true
@@ -462,7 +462,7 @@ stages:
462462
installNodeJs: false
463463
disableComponentGovernance: true
464464
artifacts:
465-
- name: Linux_musl_x64_Logs
465+
- name: Linux_musl_x64_Logs_Attempt_$(System.JobAttempt)
466466
path: artifacts/log/
467467
publishOnError: true
468468
includeForks: true
@@ -495,7 +495,7 @@ stages:
495495
$(_PublishArgs)
496496
$(_InternalRuntimeDownloadArgs)
497497
artifacts:
498-
- name: Linux_musl_arm_Logs
498+
- name: Linux_musl_arm_Logs_Attempt_$(System.JobAttempt)
499499
path: artifacts/log/
500500
publishOnError: true
501501
includeForks: true
@@ -528,7 +528,7 @@ stages:
528528
$(_PublishArgs)
529529
$(_InternalRuntimeDownloadArgs)
530530
artifacts:
531-
- name: Linux_musl_arm64_Logs
531+
- name: Linux_musl_arm64_Logs_Attempt_$(System.JobAttempt)
532532
path: artifacts/log/
533533
publishOnError: true
534534
includeForks: true
@@ -557,11 +557,11 @@ stages:
557557
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
558558
displayName: Setup IISExpress test certificates and schema
559559
artifacts:
560-
- name: Windows_Test_Logs
560+
- name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
561561
path: artifacts/log/
562562
publishOnError: true
563563
includeForks: true
564-
- name: Windows_Test_Results
564+
- name: Windows_Test_Results_Attempt_$(System.JobAttempt)
565565
path: artifacts/TestResults/
566566
publishOnError: true
567567
includeForks: true
@@ -578,11 +578,11 @@ stages:
578578
- bash: "./eng/scripts/install-nginx-mac.sh"
579579
displayName: Installing Nginx
580580
artifacts:
581-
- name: MacOS_Test_Logs
581+
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
582582
path: artifacts/log/
583583
publishOnError: true
584584
includeForks: true
585-
- name: MacOS_Test_Results
585+
- name: MacOS_Test_Results_Attempt_$(System.JobAttempt)
586586
path: artifacts/TestResults/
587587
publishOnError: true
588588
includeForks: true
@@ -601,11 +601,11 @@ stages:
601601
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
602602
displayName: Increase inotify limit
603603
artifacts:
604-
- name: Linux_Test_Logs
604+
- name: Linux_Test_Logs_Attempt_$(System.JobAttempt)
605605
path: artifacts/log/
606606
publishOnError: true
607607
includeForks: true
608-
- name: Linux_Test_Results
608+
- name: Linux_Test_Results_Attempt_$(System.JobAttempt)
609609
path: artifacts/TestResults/
610610
publishOnError: true
611611
includeForks: true
@@ -632,7 +632,7 @@ stages:
632632
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
633633

634634
artifacts:
635-
- name: Helix_logs
635+
- name: Helix_Logs_Attempt_$(System.JobAttempt)
636636
path: artifacts/log/
637637
publishOnError: true
638638
includeForks: true

‎.azure/pipelines/ci.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ extends:
166166
- powershell: ./eng/scripts/CodeCheck.ps1 -ci $(_InternalRuntimeDownloadArgs)
167167
displayName: Run eng/scripts/CodeCheck.ps1
168168
artifacts:
169-
- name: Code_Check_Logs
169+
- name: Code_Check_Logs_Attempt_$(System.JobAttempt)
170170
path: artifacts/log/
171171
publishOnError: true
172172
includeForks: true
@@ -292,7 +292,7 @@ extends:
292292
displayName: Build ARM64 Installers
293293

294294
artifacts:
295-
- name: Windows_Logs
295+
- name: Windows_Logs_Attempt_$(System.JobAttempt)
296296
path: artifacts/log/
297297
publishOnError: true
298298
includeForks: true
@@ -324,7 +324,7 @@ extends:
324324
$(_PublishArgs)
325325
$(_InternalRuntimeDownloadArgs)
326326
artifacts:
327-
- name: MacOS_arm64_Logs
327+
- name: MacOS_arm64_Logs_Attempt_$(System.JobAttempt)
328328
path: artifacts/log/
329329
publishOnError: true
330330
includeForks: true
@@ -354,7 +354,7 @@ extends:
354354
$(_PublishArgs)
355355
$(_InternalRuntimeDownloadArgs)
356356
artifacts:
357-
- name: MacOS_x64_Logs
357+
- name: MacOS_x64_Logs_Attempt_$(System.JobAttempt)
358358
path: artifacts/log/
359359
publishOnError: true
360360
includeForks: true
@@ -416,7 +416,7 @@ extends:
416416
displayName: Build RPM installers
417417
target: rpmpkg
418418
artifacts:
419-
- name: Linux_x64_Logs
419+
- name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
420420
path: artifacts/log/
421421
publishOnError: true
422422
includeForks: true
@@ -446,7 +446,7 @@ extends:
446446
$(_PublishArgs)
447447
$(_InternalRuntimeDownloadArgs)
448448
artifacts:
449-
- name: Linux_arm_Logs
449+
- name: Linux_arm_Logs_Attempt_$(System.JobAttempt)
450450
path: artifacts/log/
451451
publishOnError: true
452452
includeForks: true
@@ -493,7 +493,7 @@ extends:
493493
displayName: Build RPM installers
494494
target: rpmpkg
495495
artifacts:
496-
- name: Linux_arm64_Logs
496+
- name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
497497
path: artifacts/log/
498498
publishOnError: true
499499
includeForks: true
@@ -527,7 +527,7 @@ extends:
527527
installNodeJs: false
528528
disableComponentGovernance: true
529529
artifacts:
530-
- name: Linux_musl_x64_Logs
530+
- name: Linux_musl_x64_Logs_Attempt_$(System.JobAttempt)
531531
path: artifacts/log/
532532
publishOnError: true
533533
includeForks: true
@@ -560,7 +560,7 @@ extends:
560560
$(_PublishArgs)
561561
$(_InternalRuntimeDownloadArgs)
562562
artifacts:
563-
- name: Linux_musl_arm_Logs
563+
- name: Linux_musl_arm_Logs_Attempt_$(System.JobAttempt)
564564
path: artifacts/log/
565565
publishOnError: true
566566
includeForks: true
@@ -593,7 +593,7 @@ extends:
593593
$(_PublishArgs)
594594
$(_InternalRuntimeDownloadArgs)
595595
artifacts:
596-
- name: Linux_musl_arm64_Logs
596+
- name: Linux_musl_arm64_Logs_Attempt_$(System.JobAttempt)
597597
path: artifacts/log/
598598
publishOnError: true
599599
includeForks: true
@@ -622,11 +622,11 @@ extends:
622622
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
623623
displayName: Setup IISExpress test certificates and schema
624624
artifacts:
625-
- name: Windows_Test_Logs
625+
- name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
626626
path: artifacts/log/
627627
publishOnError: true
628628
includeForks: true
629-
- name: Windows_Test_Results
629+
- name: Windows_Test_Results_Attempt_$(System.JobAttempt)
630630
path: artifacts/TestResults/
631631
publishOnError: true
632632
includeForks: true
@@ -643,11 +643,11 @@ extends:
643643
- bash: "./eng/scripts/install-nginx-mac.sh"
644644
displayName: Installing Nginx
645645
artifacts:
646-
- name: MacOS_Test_Logs
646+
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
647647
path: artifacts/log/
648648
publishOnError: true
649649
includeForks: true
650-
- name: MacOS_Test_Results
650+
- name: MacOS_Test_Results_Attempt_$(System.JobAttempt)
651651
path: artifacts/TestResults/
652652
publishOnError: true
653653
includeForks: true
@@ -666,11 +666,11 @@ extends:
666666
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
667667
displayName: Increase inotify limit
668668
artifacts:
669-
- name: Linux_Test_Logs
669+
- name: Linux_Test_Logs_Attempt_$(System.JobAttempt)
670670
path: artifacts/log/
671671
publishOnError: true
672672
includeForks: true
673-
- name: Linux_Test_Results
673+
- name: Linux_Test_Results_Attempt_$(System.JobAttempt)
674674
path: artifacts/TestResults/
675675
publishOnError: true
676676
includeForks: true
@@ -697,7 +697,7 @@ extends:
697697
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
698698

699699
artifacts:
700-
- name: Helix_logs
700+
- name: Helix_Logs_Attempt_$(System.JobAttempt)
701701
path: artifacts/log/
702702
publishOnError: true
703703
includeForks: true

‎.azure/pipelines/jobs/codesign-xplat.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
$(_InternalRuntimeDownloadCodeSignArgs)
4646
displayName: Sign and publish packages
4747
artifacts:
48-
- name: CodeSign_Xplat_${{ parameters.inputName }}_Logs
48+
- name: CodeSign_Xplat_${{ parameters.inputName }}_Logs_Attempt_$(System.JobAttempt)
4949
path: artifacts/log/
5050
publishOnError: true
5151
includeForks: true

0 commit comments

Comments
 (0)