Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Proxy Shutdown Script #7877

Merged
merged 8 commits into from
Mar 14, 2024
Merged

Add Proxy Shutdown Script #7877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a6b6c07
create necessary eng/common changes to allow proxy to be shut down. a…
scbedd Mar 14, 2024
fbc6ac2
actually fix the yaml updates
scbedd Mar 14, 2024
edc1c14
fix the callsites
scbedd Mar 14, 2024
ad117f2
now add some output so we can confirm the logs
scbedd Mar 14, 2024
f5ccf6d
relative -> absolute
scbedd Mar 14, 2024
e5fc7ec
test-proxy isalive check after shutdown
scbedd Mar 14, 2024
5c6d796
attempts from 10 to 2
scbedd Mar 14, 2024
cd00b29
delete test-proxy-shutdown. remove bad comment
scbedd Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions eng/common/testproxy/test-proxy-tool-shutdown.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
steps:
- pwsh: |
Stop-Process -Id $(PROXY_PID)
displayName: 'Shut down the testproxy - windows'
condition: and(succeeded(), eq(variables['Agent.OS'],'Windows_NT'))

- bash: |
kill -9 $(PROXY_PID)
displayName: "Shut down the testproxy - linux/mac"
condition: and(succeeded(), ne(variables['Agent.OS'],'Windows_NT'))
8 changes: 7 additions & 1 deletion eng/common/testproxy/test-proxy-tool.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# This template sets variable PROXY_PID to be used for shutdown later.
parameters:
rootFolder: '$(Build.SourcesDirectory)'
runProxy: true
Expand Down Expand Up @@ -42,15 +43,20 @@ steps:
condition: and(succeeded(), ${{ parameters.condition }})

- pwsh: |
Start-Process $(Build.BinariesDirectory)/test-proxy/test-proxy.exe `
$Process = Start-Process $(Build.BinariesDirectory)/test-proxy/test-proxy.exe `
-ArgumentList "start --storage-location ${{ parameters.rootFolder }} -U" `
-NoNewWindow -PassThru -RedirectStandardOutput ${{ parameters.rootFolder }}/test-proxy.log

Write-Host "##vso[task.setvariable variable=PROXY_PID]$($Process.Id)"
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 &>$(Build.SourcesDirectory)/test-proxy.log &

echo $! > $(Build.SourcesDirectory)/test-proxy.pid
echo "##vso[task.setvariable variable=PROXY_PID]$(cat $(Build.SourcesDirectory)/test-proxy.pid)"
displayName: "Run the testproxy - linux/mac"
condition: and(succeeded(), ne(variables['Agent.OS'],'Windows_NT'), ${{ parameters.condition }})
workingDirectory: "${{ parameters.rootFolder }}"
Expand Down