Sync eng/common directory with azure-sdk-tools for PR 3238 (Azure#17755)

* pin proxy version to one that properly sets listenoptions * targeted proxy repo is incorrect. "testproxy" -> "test-proxy" * remove override now that the targeted version will work correctly Co-authored-by: scbedd <[email protected]>
azure-sdk · Apr 27, 2022 · e4b9df8 · e4b9df8
1 parent 3f7acd2
commit e4b9df8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/eng/common/testproxy/docker-start-proxy.ps1 b/eng/common/testproxy/docker-start-proxy.ps1
@@ -38,7 +38,7 @@ catch {
 
 $SELECTED_IMAGE_TAG = $(Get-Content "$PSScriptRoot/target_version.txt" -Raw).Trim()
 $CONTAINER_NAME = "ambitious_azsdk_test_proxy"
-$IMAGE_SOURCE = "azsdkengsys.azurecr.io/engsys/testproxy:${SELECTED_IMAGE_TAG}"
+$IMAGE_SOURCE = "azsdkengsys.azurecr.io/engsys/test-proxy:${SELECTED_IMAGE_TAG}"
 
 if($VersionOverride) { 
     Write-Host "Overriding default target proxy version of '$SELECTED_IMAGE_TAG' with override $VersionOverride."

diff --git a/eng/common/testproxy/target_version.txt b/eng/common/testproxy/target_version.txt
@@ -1 +1 @@
-1.0.0-dev.20220426.1
+1.0.0-dev.20220427.1
diff --git a/eng/pipelines/templates/steps/build-test.yml b/eng/pipelines/templates/steps/build-test.yml
@@ -48,9 +48,6 @@ steps:
 
   - ${{ if eq(parameters.TestProxy, true) }}:
     - template: /eng/common/testproxy/test-proxy-tool.yml
-      parameters:
-        targetVersion: '1.0.0-dev.20220224.2'
-
 
   - task: PowerShell@2
     displayName: 'Run Tests'