Skip to content

Commit df28e8f

Browse files
azure-sdkscbedd
andauthored
Sync eng/common directory with azure-sdk-tools for PR 5224 (Azure#33173)
* feature/upload-proxy-artifact * update template to ensure that having the file in use on windows doesn't break the build Co-authored-by: scbedd <[email protected]>
1 parent 72adf1f commit df28e8f

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
parameters:
2+
rootFolder: '$(Build.SourcesDirectory)'
3+
4+
steps:
5+
- pwsh: |
6+
Copy-Item -Path "${{ parameters.rootFolder }}/test-proxy.log" -Destination "${{ parameters.rootFolder }}/proxy.log"
7+
displayName: Copy Log File
8+
9+
- template: ../pipelines/templates/steps/publish-artifact.yml
10+
parameters:
11+
ArtifactName: "$(System.JobName)-proxy-logs"
12+
ArtifactPath: "${{ parameters.rootFolder }}/proxy.log"
13+
14+
- pwsh: |
15+
Remove-Item -Force ${{ parameters.rootFolder }}/proxy.log
16+
displayName: Cleanup Copied Log File

eng/common/testproxy/test-proxy-tool.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ steps:
4242
- pwsh: |
4343
Start-Process $(Build.BinariesDirectory)/test-proxy/test-proxy.exe `
4444
-ArgumentList "--storage-location ${{ parameters.rootFolder }}" `
45-
-NoNewWindow -PassThru -RedirectStandardOutput ${{ parameters.templateRoot }}/test-proxy.log
45+
-NoNewWindow -PassThru -RedirectStandardOutput ${{ parameters.rootFolder }}/test-proxy.log
4646
displayName: 'Run the testproxy - windows'
4747
condition: and(succeeded(), eq(variables['Agent.OS'],'Windows_NT'), ${{ parameters.condition }})
4848
4949
# nohup does NOT continue beyond the current session if you use it within powershell
5050
- bash: |
51-
nohup $(Build.BinariesDirectory)/test-proxy/test-proxy > ${{ parameters.templateRoot }}/test-proxy.log &
51+
nohup $(Build.BinariesDirectory)/test-proxy/test-proxy > ${{ parameters.rootFolder }}/test-proxy.log &
5252
displayName: "Run the testproxy - linux/mac"
5353
condition: and(succeeded(), ne(variables['Agent.OS'],'Windows_NT'), ${{ parameters.condition }})
5454
workingDirectory: "${{ parameters.rootFolder }}"

0 commit comments

Comments
 (0)