From 26bb0c4e4d04ddaa476e3837683b11f8a8a2b722 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 d520c7689310..b6cff5591f2f 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 9174c85b90ff2cf41fed8bfb0d0bed6518ec2249 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 b6cff5591f2f..8a8a0fdfa340 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 5c9ffb404e1294088aaaa8edcf96254e1f5257c9 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 8a8a0fdfa340..b6cff5591f2f 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)"