Sync eng/common directory with azure-sdk-tools for PR 5224 (#4274)

* feature/upload-proxy-artifact

* update template to ensure that having the file in use on windows doesn't break the build

* incoming PR fixes where test-proxy stores its log. as as result, we also need to update the location of where we read out the test-proxy log

Co-authored-by: scbedd <45376673+scbedd@users.noreply.github.com>
This commit is contained in:
Azure SDK Bot 2023-01-26 16:47:47 -08:00 committed by GitHub
parent 74a1ad7714
commit a3e9ad1d2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 3 deletions

View File

@ -0,0 +1,16 @@
parameters:
rootFolder: '$(Build.SourcesDirectory)'
steps:
- pwsh: |
Copy-Item -Path "${{ parameters.rootFolder }}/test-proxy.log" -Destination "${{ parameters.rootFolder }}/proxy.log"
displayName: Copy Log File
- template: ../pipelines/templates/steps/publish-artifact.yml
parameters:
ArtifactName: "$(System.JobName)-proxy-logs"
ArtifactPath: "${{ parameters.rootFolder }}/proxy.log"
- pwsh: |
Remove-Item -Force ${{ parameters.rootFolder }}/proxy.log
displayName: Cleanup Copied Log File

View File

@ -42,13 +42,13 @@ steps:
- pwsh: |
Start-Process $(Build.BinariesDirectory)/test-proxy/test-proxy.exe `
-ArgumentList "--storage-location ${{ parameters.rootFolder }}" `
-NoNewWindow -PassThru -RedirectStandardOutput ${{ parameters.templateRoot }}/test-proxy.log
-NoNewWindow -PassThru -RedirectStandardOutput ${{ parameters.rootFolder }}/test-proxy.log
displayName: 'Run the testproxy - windows'
condition: and(succeeded(), eq(variables['Agent.OS'],'Windows_NT'), ${{ parameters.condition }})
# nohup does NOT continue beyond the current session if you use it within powershell
- bash: |
nohup $(Build.BinariesDirectory)/test-proxy/test-proxy > ${{ parameters.templateRoot }}/test-proxy.log &
nohup $(Build.BinariesDirectory)/test-proxy/test-proxy > ${{ parameters.rootFolder }}/test-proxy.log &
displayName: "Run the testproxy - linux/mac"
condition: and(succeeded(), ne(variables['Agent.OS'],'Windows_NT'), ${{ parameters.condition }})
workingDirectory: "${{ parameters.rootFolder }}"

View File

@ -204,7 +204,7 @@ jobs:
get-content test-proxy.log
displayName: TestProxy Log
condition: and(succeededOrFailed(), contains(variables.CmakeArgs, 'BUILD_TESTING=ON'),ne('${{parameters.ServiceDirectory}}', 'template'))
workingDirectory: $(Build.SourcesDirectory)
workingDirectory: $(Build.SourcesDirectory)/sdk/${{parameters.ServiceDirectory}}
continueOnError: true
- task: PublishTestResults@2