Skip to content

Commit a9a9679

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 41208: Updated ci.yml - name artifacts with attempt number where publish on error is...
Updated ci.yml and ci-public.yml - name artifacts with attempt number where publish on error is true (logs, test results) This allows individual jobs to succeed on retry instead of failing when they try to reupload a log artifact with the same name. ---- #### AI description (iteration 1) #### PR Classification Enhancement to CI configuration. #### PR Summary This pull request updates the CI pipeline configuration to include the attempt number in the names of artifacts published on error. This helps in distinguishing artifacts from different job attempts. - Changes in `/.azure/pipelines/ci.yml` to append `$(System.JobAttempt)` to artifact names for Windows, MacOS, and Linux logs and test results.
2 parents 02af77e + d7cd46e commit a9a9679

2 files changed

Lines changed: 34 additions & 34 deletions

File tree

‎.azure/pipelines/ci-public.yml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ stages:
9393
- powershell: ./eng/scripts/CodeCheck.ps1 -ci $(_InternalRuntimeDownloadArgs)
9494
displayName: Run eng/scripts/CodeCheck.ps1
9595
artifacts:
96-
- name: Code_Check_Logs
96+
- name: Code_Check_Logs_Attempt_$(System.JobAttempt)
9797
path: artifacts/log/
9898
publishOnError: true
9999
includeForks: true
@@ -213,7 +213,7 @@ stages:
213213
displayName: Build ARM64 Installers
214214

215215
artifacts:
216-
- name: Windows_Logs
216+
- name: Windows_Logs_Attempt_$(System.JobAttempt)
217217
path: artifacts/log/
218218
publishOnError: true
219219
includeForks: true
@@ -246,7 +246,7 @@ stages:
246246
$(_InternalRuntimeDownloadArgs)
247247
installNodeJs: false
248248
artifacts:
249-
- name: MacOS_arm64_Logs
249+
- name: MacOS_arm64_Logs_Attempt_$(System.JobAttempt)
250250
path: artifacts/log/
251251
publishOnError: true
252252
includeForks: true
@@ -277,7 +277,7 @@ stages:
277277
$(_InternalRuntimeDownloadArgs)
278278
installNodeJs: false
279279
artifacts:
280-
- name: MacOS_x64_Logs
280+
- name: MacOS_x64_Logs_Attempt_$(System.JobAttempt)
281281
path: artifacts/log/
282282
publishOnError: true
283283
includeForks: true
@@ -324,7 +324,7 @@ stages:
324324
displayName: Build RPM installers
325325
installNodeJs: false
326326
artifacts:
327-
- name: Linux_x64_Logs
327+
- name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
328328
path: artifacts/log/
329329
publishOnError: true
330330
includeForks: true
@@ -355,7 +355,7 @@ stages:
355355
$(_InternalRuntimeDownloadArgs)
356356
installNodeJs: false
357357
artifacts:
358-
- name: Linux_arm_Logs
358+
- name: Linux_arm_Logs_Attempt_$(System.JobAttempt)
359359
path: artifacts/log/
360360
publishOnError: true
361361
includeForks: true
@@ -395,7 +395,7 @@ stages:
395395
displayName: Build RPM installers
396396
installNodeJs: false
397397
artifacts:
398-
- name: Linux_arm64_Logs
398+
- name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
399399
path: artifacts/log/
400400
publishOnError: true
401401
includeForks: true
@@ -429,7 +429,7 @@ stages:
429429
installNodeJs: false
430430
disableComponentGovernance: true
431431
artifacts:
432-
- name: Linux_musl_x64_Logs
432+
- name: Linux_musl_x64_Logs_Attempt_$(System.JobAttempt)
433433
path: artifacts/log/
434434
publishOnError: true
435435
includeForks: true
@@ -463,7 +463,7 @@ stages:
463463
$(_InternalRuntimeDownloadArgs)
464464
installNodeJs: false
465465
artifacts:
466-
- name: Linux_musl_arm_Logs
466+
- name: Linux_musl_arm_Logs_Attempt_$(System.JobAttempt)
467467
path: artifacts/log/
468468
publishOnError: true
469469
includeForks: true
@@ -497,7 +497,7 @@ stages:
497497
$(_InternalRuntimeDownloadArgs)
498498
installNodeJs: false
499499
artifacts:
500-
- name: Linux_musl_arm64_Logs
500+
- name: Linux_musl_arm64_Logs_Attempt_$(System.JobAttempt)
501501
path: artifacts/log/
502502
publishOnError: true
503503
includeForks: true
@@ -526,11 +526,11 @@ stages:
526526
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
527527
displayName: Setup IISExpress test certificates and schema
528528
artifacts:
529-
- name: Windows_Test_Logs
529+
- name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
530530
path: artifacts/log/
531531
publishOnError: true
532532
includeForks: true
533-
- name: Windows_Test_Results
533+
- name: Windows_Test_Results_Attempt_$(System.JobAttempt)
534534
path: artifacts/TestResults/
535535
publishOnError: true
536536
includeForks: true
@@ -547,11 +547,11 @@ stages:
547547
- bash: "./eng/scripts/install-nginx-mac.sh"
548548
displayName: Installing Nginx
549549
artifacts:
550-
- name: MacOS_Test_Logs
550+
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
551551
path: artifacts/log/
552552
publishOnError: true
553553
includeForks: true
554-
- name: MacOS_Test_Results
554+
- name: MacOS_Test_Results_Attempt_$(System.JobAttempt)
555555
path: artifacts/TestResults/
556556
publishOnError: true
557557
includeForks: true
@@ -570,11 +570,11 @@ stages:
570570
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
571571
displayName: Increase inotify limit
572572
artifacts:
573-
- name: Linux_Test_Logs
573+
- name: Linux_Test_Logs_Attempt_$(System.JobAttempt)
574574
path: artifacts/log/
575575
publishOnError: true
576576
includeForks: true
577-
- name: Linux_Test_Results
577+
- name: Linux_Test_Results_Attempt_$(System.JobAttempt)
578578
path: artifacts/TestResults/
579579
publishOnError: true
580580
includeForks: true
@@ -601,7 +601,7 @@ stages:
601601
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
602602

603603
artifacts:
604-
- name: Helix_logs
604+
- name: Helix_Logs_Attempt_$(System.JobAttempt)
605605
path: artifacts/log/
606606
publishOnError: true
607607
includeForks: true

‎.azure/pipelines/ci.yml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ extends:
160160
- powershell: ./eng/scripts/CodeCheck.ps1 -ci $(_InternalRuntimeDownloadArgs)
161161
displayName: Run eng/scripts/CodeCheck.ps1
162162
artifacts:
163-
- name: Code_Check_Logs
163+
- name: Code_Check_Logs_Attempt_$(System.JobAttempt)
164164
path: artifacts/log/
165165
publishOnError: true
166166
includeForks: true
@@ -280,7 +280,7 @@ extends:
280280
displayName: Build ARM64 Installers
281281

282282
artifacts:
283-
- name: Windows_Logs
283+
- name: Windows_Logs_Attempt_$(System.JobAttempt)
284284
path: artifacts/log/
285285
publishOnError: true
286286
includeForks: true
@@ -312,7 +312,7 @@ extends:
312312
$(_InternalRuntimeDownloadArgs)
313313
installNodeJs: false
314314
artifacts:
315-
- name: MacOS_arm64_Logs
315+
- name: MacOS_arm64_Logs_Attempt_$(System.JobAttempt)
316316
path: artifacts/log/
317317
publishOnError: true
318318
includeForks: true
@@ -342,7 +342,7 @@ extends:
342342
$(_InternalRuntimeDownloadArgs)
343343
installNodeJs: false
344344
artifacts:
345-
- name: MacOS_x64_Logs
345+
- name: MacOS_x64_Logs_Attempt_$(System.JobAttempt)
346346
path: artifacts/log/
347347
publishOnError: true
348348
includeForks: true
@@ -389,7 +389,7 @@ extends:
389389
displayName: Build RPM installers
390390
installNodeJs: false
391391
artifacts:
392-
- name: Linux_x64_Logs
392+
- name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
393393
path: artifacts/log/
394394
publishOnError: true
395395
includeForks: true
@@ -420,7 +420,7 @@ extends:
420420
$(_InternalRuntimeDownloadArgs)
421421
installNodeJs: false
422422
artifacts:
423-
- name: Linux_arm_Logs
423+
- name: Linux_arm_Logs_Attempt_$(System.JobAttempt)
424424
path: artifacts/log/
425425
publishOnError: true
426426
includeForks: true
@@ -460,7 +460,7 @@ extends:
460460
displayName: Build RPM installers
461461
installNodeJs: false
462462
artifacts:
463-
- name: Linux_arm64_Logs
463+
- name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
464464
path: artifacts/log/
465465
publishOnError: true
466466
includeForks: true
@@ -494,7 +494,7 @@ extends:
494494
installNodeJs: false
495495
disableComponentGovernance: true
496496
artifacts:
497-
- name: Linux_musl_x64_Logs
497+
- name: Linux_musl_x64_Logs_Attempt_$(System.JobAttempt)
498498
path: artifacts/log/
499499
publishOnError: true
500500
includeForks: true
@@ -528,7 +528,7 @@ extends:
528528
$(_InternalRuntimeDownloadArgs)
529529
installNodeJs: false
530530
artifacts:
531-
- name: Linux_musl_arm_Logs
531+
- name: Linux_musl_arm_Logs_Attempt_$(System.JobAttempt)
532532
path: artifacts/log/
533533
publishOnError: true
534534
includeForks: true
@@ -562,7 +562,7 @@ extends:
562562
$(_InternalRuntimeDownloadArgs)
563563
installNodeJs: false
564564
artifacts:
565-
- name: Linux_musl_arm64_Logs
565+
- name: Linux_musl_arm64_Logs_Attempt_$(System.JobAttempt)
566566
path: artifacts/log/
567567
publishOnError: true
568568
includeForks: true
@@ -591,11 +591,11 @@ extends:
591591
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
592592
displayName: Setup IISExpress test certificates and schema
593593
artifacts:
594-
- name: Windows_Test_Logs
594+
- name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
595595
path: artifacts/log/
596596
publishOnError: true
597597
includeForks: true
598-
- name: Windows_Test_Results
598+
- name: Windows_Test_Results_Attempt_$(System.JobAttempt)
599599
path: artifacts/TestResults/
600600
publishOnError: true
601601
includeForks: true
@@ -612,11 +612,11 @@ extends:
612612
- bash: "./eng/scripts/install-nginx-mac.sh"
613613
displayName: Installing Nginx
614614
artifacts:
615-
- name: MacOS_Test_Logs
615+
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
616616
path: artifacts/log/
617617
publishOnError: true
618618
includeForks: true
619-
- name: MacOS_Test_Results
619+
- name: MacOS_Test_Results_Attempt_$(System.JobAttempt)
620620
path: artifacts/TestResults/
621621
publishOnError: true
622622
includeForks: true
@@ -635,11 +635,11 @@ extends:
635635
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
636636
displayName: Increase inotify limit
637637
artifacts:
638-
- name: Linux_Test_Logs
638+
- name: Linux_Test_Logs_Attempt_$(System.JobAttempt)
639639
path: artifacts/log/
640640
publishOnError: true
641641
includeForks: true
642-
- name: Linux_Test_Results
642+
- name: Linux_Test_Results_Attempt_$(System.JobAttempt)
643643
path: artifacts/TestResults/
644644
publishOnError: true
645645
includeForks: true
@@ -666,7 +666,7 @@ extends:
666666
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
667667

668668
artifacts:
669-
- name: Helix_logs
669+
- name: Helix_Logs_Attempt_$(System.JobAttempt)
670670
path: artifacts/log/
671671
publishOnError: true
672672
includeForks: true

0 commit comments

Comments
 (0)