Skip to content

Commit e4b9df8

Browse files
azure-sdkscbedd
andauthored
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 <45376673+scbedd@users.noreply.github.com>
1 parent 3f7acd2 commit e4b9df8

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

eng/common/testproxy/docker-start-proxy.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ catch {
3838

3939
$SELECTED_IMAGE_TAG = $(Get-Content "$PSScriptRoot/target_version.txt" -Raw).Trim()
4040
$CONTAINER_NAME = "ambitious_azsdk_test_proxy"
41-
$IMAGE_SOURCE = "azsdkengsys.azurecr.io/engsys/testproxy:${SELECTED_IMAGE_TAG}"
41+
$IMAGE_SOURCE = "azsdkengsys.azurecr.io/engsys/test-proxy:${SELECTED_IMAGE_TAG}"
4242

4343
if($VersionOverride) {
4444
Write-Host "Overriding default target proxy version of '$SELECTED_IMAGE_TAG' with override $VersionOverride."
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.0-dev.20220426.1
1+
1.0.0-dev.20220427.1

eng/pipelines/templates/steps/build-test.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ steps:
4848
4949
- ${{ if eq(parameters.TestProxy, true) }}:
5050
- template: /eng/common/testproxy/test-proxy-tool.yml
51-
parameters:
52-
targetVersion: '1.0.0-dev.20220224.2'
53-
5451

5552
- task: PowerShell@2
5653
displayName: 'Run Tests'

0 commit comments

Comments
 (0)