Skip to content

Commit

Permalink
Log Program Files directories, fix aggregation bugs (Azure#9424)
Browse files Browse the repository at this point in the history
* Check for OpenSSL

Gets filtered env vars and directory names under Program Files and Program Files (x86).

* Fix build issues

Duplicate and unnecessary macos-latest, and fix display name for one new step.

* Recurse into OpenSSL

* Assemble inventories even if one job fails

* Fix typo

* Show OpenSSL directories with relative paths

* Remove OpenSSL-specific steps
  • Loading branch information
heaths authored Nov 25, 2024
1 parent bf6a76c commit c333064
Showing 1 changed file with 17 additions and 4 deletions.
21 changes: 17 additions & 4 deletions eng/pipelines/agent-software-inventory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ jobs:
Pool: azsdk-pool-mms-win-2022-general
OSVmImage: MMS2022
Host: Windows
CustomMacOS:
Pool: Azure Pipelines
OSVmImage: macos-latest
Host: MacOS

pool:
name: $(Pool)
Expand Down Expand Up @@ -126,13 +122,30 @@ jobs:
} > powershell-inventory.csv
displayName: PowerShell modules
workingDirectory: $(Build.ArtifactStagingDirectory)
- pwsh: |
Get-ChildItem "${env:ProgramFiles}" | ForEach-Object {
"$(Host), $(OSVmImage), ProgramFiles, $($_.Name), , all"
} > programfiles-inventory.csv
displayName: Program Files
workingDirectory: $(Build.ArtifactStagingDirectory)
condition: and(succeeded(), eq(variables.Host, 'Windows'))
- pwsh: |
Get-ChildItem "${env:ProgramFiles(x86)}" | ForEach-Object {
"$(Host), $(OSVmImage), ProgramFilesX86, $($_.Name), , all"
} >> programfiles-inventory.csv
displayName: Program Files (x86)
workingDirectory: $(Build.ArtifactStagingDirectory)
condition: and(succeeded(), eq(variables.Host, 'Windows'))
- publish: $(Build.ArtifactStagingDirectory)
displayName: Publish inventory-$(OSVmImage)
artifact: inventory-$(OSVmImage)

- job: assemble
dependsOn: inventory
condition: succeededOrFailed()
pool:
vmImage: ubuntu-latest
steps:
Expand Down

0 comments on commit c333064

Please sign in to comment.