Skip to content

Commit edbdd9a

Browse files
azure-sdkscbedd
andauthored
Sync eng/common directory with azure-sdk-tools for PR 8158 (#35354)
* allow an override FILE to be honored by test-proxy-tool * update local test-framework to honor proxy override version by default --------- Co-authored-by: Scott Beddall (from Dev Box) <[email protected]>
1 parent 2669c52 commit edbdd9a

File tree

4 files changed

+21
-43
lines changed

4 files changed

+21
-43
lines changed

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

Lines changed: 0 additions & 40 deletions
This file was deleted.

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,17 @@ steps:
2222
pwsh: true
2323

2424
- pwsh: |
25-
$version = $(Get-Content "${{ parameters.templateRoot }}/eng/common/testproxy/target_version.txt" -Raw).Trim()
25+
$standardVersion = "${{ parameters.templateRoot }}/eng/common/testproxy/target_version.txt"
26+
$overrideVersion = "${{ parameters.templateRoot }}/eng/target_proxy_version.txt"
27+
28+
$version = $(Get-Content $standardVersion -Raw).Trim()
29+
30+
if (Test-Path $overrideVersion) {
31+
$version = $(Get-Content $overrideVersion -Raw).Trim()
32+
}
33+
34+
Write-Host "Installing test-proxy version $version"
35+
2636
dotnet tool install azure.sdk.tools.testproxy `
2737
--tool-path $(Build.BinariesDirectory)/test-proxy `
2838
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json `

eng/target_proxy_version.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.0.0-dev.20240410.1

tools/azure-sdk-tools/devtools_testutils/proxy_startup.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,17 @@
9393
def get_target_version(repo_root: str) -> str:
9494
"""Gets the target test-proxy version from the target_version.txt file in /eng/common/testproxy"""
9595
version_file_location = os.path.relpath("eng/common/testproxy/target_version.txt")
96+
override_version_file_location = os.path.relpath("eng/target_proxy_version.txt")
97+
9698
version_file_location_from_root = os.path.abspath(os.path.join(repo_root, version_file_location))
99+
override_version_file_location_from_root = os.path.abspath(os.path.join(repo_root, override_version_file_location))
97100

98-
with open(version_file_location_from_root, "r") as f:
99-
target_version = f.read().strip()
101+
if os.path.exists(override_version_file_location_from_root):
102+
with open(override_version_file_location_from_root, "r") as f:
103+
target_version = f.read().strip()
104+
else:
105+
with open(version_file_location_from_root, "r") as f:
106+
target_version = f.read().strip()
100107

101108
return target_version
102109

0 commit comments

Comments
 (0)