Skip to content

Commit

Permalink
Merged PR 41208: Updated ci.yml - name artifacts with attempt number …
Browse files Browse the repository at this point in the history
…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.
  • Loading branch information
vseanreesermsft committed Jul 18, 2024
2 parents 02af77e + d7cd46e commit a9a9679
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 34 deletions.
34 changes: 17 additions & 17 deletions .azure/pipelines/ci-public.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ stages:
- powershell: ./eng/scripts/CodeCheck.ps1 -ci $(_InternalRuntimeDownloadArgs)
displayName: Run eng/scripts/CodeCheck.ps1
artifacts:
- name: Code_Check_Logs
- name: Code_Check_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
Expand Down Expand Up @@ -213,7 +213,7 @@ stages:
displayName: Build ARM64 Installers

artifacts:
- name: Windows_Logs
- name: Windows_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
Expand Down Expand Up @@ -246,7 +246,7 @@ stages:
$(_InternalRuntimeDownloadArgs)
installNodeJs: false
artifacts:
- name: MacOS_arm64_Logs
- name: MacOS_arm64_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
Expand Down Expand Up @@ -277,7 +277,7 @@ stages:
$(_InternalRuntimeDownloadArgs)
installNodeJs: false
artifacts:
- name: MacOS_x64_Logs
- name: MacOS_x64_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
Expand Down Expand Up @@ -324,7 +324,7 @@ stages:
displayName: Build RPM installers
installNodeJs: false
artifacts:
- name: Linux_x64_Logs
- name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
Expand Down Expand Up @@ -355,7 +355,7 @@ stages:
$(_InternalRuntimeDownloadArgs)
installNodeJs: false
artifacts:
- name: Linux_arm_Logs
- name: Linux_arm_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
Expand Down Expand Up @@ -395,7 +395,7 @@ stages:
displayName: Build RPM installers
installNodeJs: false
artifacts:
- name: Linux_arm64_Logs
- name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
Expand Down Expand Up @@ -429,7 +429,7 @@ stages:
installNodeJs: false
disableComponentGovernance: true
artifacts:
- name: Linux_musl_x64_Logs
- name: Linux_musl_x64_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
Expand Down Expand Up @@ -463,7 +463,7 @@ stages:
$(_InternalRuntimeDownloadArgs)
installNodeJs: false
artifacts:
- name: Linux_musl_arm_Logs
- name: Linux_musl_arm_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
Expand Down Expand Up @@ -497,7 +497,7 @@ stages:
$(_InternalRuntimeDownloadArgs)
installNodeJs: false
artifacts:
- name: Linux_musl_arm64_Logs
- name: Linux_musl_arm64_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
Expand Down Expand Up @@ -526,11 +526,11 @@ stages:
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
displayName: Setup IISExpress test certificates and schema
artifacts:
- name: Windows_Test_Logs
- name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
- name: Windows_Test_Results
- name: Windows_Test_Results_Attempt_$(System.JobAttempt)
path: artifacts/TestResults/
publishOnError: true
includeForks: true
Expand All @@ -547,11 +547,11 @@ stages:
- bash: "./eng/scripts/install-nginx-mac.sh"
displayName: Installing Nginx
artifacts:
- name: MacOS_Test_Logs
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
- name: MacOS_Test_Results
- name: MacOS_Test_Results_Attempt_$(System.JobAttempt)
path: artifacts/TestResults/
publishOnError: true
includeForks: true
Expand All @@ -570,11 +570,11 @@ stages:
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
displayName: Increase inotify limit
artifacts:
- name: Linux_Test_Logs
- name: Linux_Test_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
- name: Linux_Test_Results
- name: Linux_Test_Results_Attempt_$(System.JobAttempt)
path: artifacts/TestResults/
publishOnError: true
includeForks: true
Expand All @@ -601,7 +601,7 @@ stages:
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops

artifacts:
- name: Helix_logs
- name: Helix_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
Expand Down
34 changes: 17 additions & 17 deletions .azure/pipelines/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ extends:
- powershell: ./eng/scripts/CodeCheck.ps1 -ci $(_InternalRuntimeDownloadArgs)
displayName: Run eng/scripts/CodeCheck.ps1
artifacts:
- name: Code_Check_Logs
- name: Code_Check_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
Expand Down Expand Up @@ -280,7 +280,7 @@ extends:
displayName: Build ARM64 Installers

artifacts:
- name: Windows_Logs
- name: Windows_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
Expand Down Expand Up @@ -312,7 +312,7 @@ extends:
$(_InternalRuntimeDownloadArgs)
installNodeJs: false
artifacts:
- name: MacOS_arm64_Logs
- name: MacOS_arm64_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
Expand Down Expand Up @@ -342,7 +342,7 @@ extends:
$(_InternalRuntimeDownloadArgs)
installNodeJs: false
artifacts:
- name: MacOS_x64_Logs
- name: MacOS_x64_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
Expand Down Expand Up @@ -389,7 +389,7 @@ extends:
displayName: Build RPM installers
installNodeJs: false
artifacts:
- name: Linux_x64_Logs
- name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
Expand Down Expand Up @@ -420,7 +420,7 @@ extends:
$(_InternalRuntimeDownloadArgs)
installNodeJs: false
artifacts:
- name: Linux_arm_Logs
- name: Linux_arm_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
Expand Down Expand Up @@ -460,7 +460,7 @@ extends:
displayName: Build RPM installers
installNodeJs: false
artifacts:
- name: Linux_arm64_Logs
- name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
Expand Down Expand Up @@ -494,7 +494,7 @@ extends:
installNodeJs: false
disableComponentGovernance: true
artifacts:
- name: Linux_musl_x64_Logs
- name: Linux_musl_x64_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
Expand Down Expand Up @@ -528,7 +528,7 @@ extends:
$(_InternalRuntimeDownloadArgs)
installNodeJs: false
artifacts:
- name: Linux_musl_arm_Logs
- name: Linux_musl_arm_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
Expand Down Expand Up @@ -562,7 +562,7 @@ extends:
$(_InternalRuntimeDownloadArgs)
installNodeJs: false
artifacts:
- name: Linux_musl_arm64_Logs
- name: Linux_musl_arm64_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
Expand Down Expand Up @@ -591,11 +591,11 @@ extends:
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
displayName: Setup IISExpress test certificates and schema
artifacts:
- name: Windows_Test_Logs
- name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
- name: Windows_Test_Results
- name: Windows_Test_Results_Attempt_$(System.JobAttempt)
path: artifacts/TestResults/
publishOnError: true
includeForks: true
Expand All @@ -612,11 +612,11 @@ extends:
- bash: "./eng/scripts/install-nginx-mac.sh"
displayName: Installing Nginx
artifacts:
- name: MacOS_Test_Logs
- name: MacOS_Test_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
- name: MacOS_Test_Results
- name: MacOS_Test_Results_Attempt_$(System.JobAttempt)
path: artifacts/TestResults/
publishOnError: true
includeForks: true
Expand All @@ -635,11 +635,11 @@ extends:
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
displayName: Increase inotify limit
artifacts:
- name: Linux_Test_Logs
- name: Linux_Test_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
- name: Linux_Test_Results
- name: Linux_Test_Results_Attempt_$(System.JobAttempt)
path: artifacts/TestResults/
publishOnError: true
includeForks: true
Expand All @@ -666,7 +666,7 @@ extends:
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops

artifacts:
- name: Helix_logs
- name: Helix_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
Expand Down

0 comments on commit a9a9679

Please sign in to comment.