From 093e941b3db04becfa9b413a7dddf05f28432ad1 Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Fri, 17 May 2024 13:54:24 -0700 Subject: [PATCH 1/3] ensure we write the log to the same root directory as what is being used for the proxy invocation --- eng/common/testproxy/test-proxy-tool.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/common/testproxy/test-proxy-tool.yml b/eng/common/testproxy/test-proxy-tool.yml index d520c76893..b6cff5591f 100644 --- a/eng/common/testproxy/test-proxy-tool.yml +++ b/eng/common/testproxy/test-proxy-tool.yml @@ -63,8 +63,8 @@ steps: # 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 & - + nohup $(Build.BinariesDirectory)/test-proxy/test-proxy &>${{ parameters.rootFolder }}/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" From 66c01349e2d326b6f12676a26b15cb64ab35662d Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Fri, 17 May 2024 13:57:04 -0700 Subject: [PATCH 2/3] fix spacing --- eng/common/testproxy/test-proxy-tool.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/testproxy/test-proxy-tool.yml b/eng/common/testproxy/test-proxy-tool.yml index b6cff5591f..8a8a0fdfa3 100644 --- a/eng/common/testproxy/test-proxy-tool.yml +++ b/eng/common/testproxy/test-proxy-tool.yml @@ -63,7 +63,7 @@ steps: # nohup does NOT continue beyond the current session if you use it within powershell - bash: | - nohup $(Build.BinariesDirectory)/test-proxy/test-proxy &>${{ parameters.rootFolder }}/test-proxy.log & + 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)" From f7a4879d354cd38e5320b94edceba9197e3db75b Mon Sep 17 00:00:00 2001 From: Scott Beddall Date: Fri, 17 May 2024 15:24:22 -0700 Subject: [PATCH 3/3] we should write these proxy logs to the same root folder that we start the proxy in --- eng/common/testproxy/test-proxy-tool.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/testproxy/test-proxy-tool.yml b/eng/common/testproxy/test-proxy-tool.yml index 8a8a0fdfa3..b6cff5591f 100644 --- a/eng/common/testproxy/test-proxy-tool.yml +++ b/eng/common/testproxy/test-proxy-tool.yml @@ -63,7 +63,7 @@ steps: # 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 & + nohup $(Build.BinariesDirectory)/test-proxy/test-proxy &>${{ parameters.rootFolder }}/test-proxy.log & echo $! > $(Build.SourcesDirectory)/test-proxy.pid echo "##vso[task.setvariable variable=PROXY_PID]$(cat $(Build.SourcesDirectory)/test-proxy.pid)"